From 8cdae431860cca46086405162e04c2d642449033 Mon Sep 17 00:00:00 2001 From: WizardXiao Date: Tue, 16 Nov 2021 14:18:10 +0800 Subject: [PATCH] commit-message: fix instability test in shardddl1 --- dm/dm/master/shardddl/optimist.go | 2 +- dm/dm/master/shardddl/pessimist.go | 2 +- dm/tests/shardddl1/run.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dm/dm/master/shardddl/optimist.go b/dm/dm/master/shardddl/optimist.go index 2c1ca3c568b..eda57ea0332 100644 --- a/dm/dm/master/shardddl/optimist.go +++ b/dm/dm/master/shardddl/optimist.go @@ -698,7 +698,7 @@ func (o *Optimist) handleLock(info optimism.Info, tts []optimism.TargetTable, sk func (o *Optimist) removeLock(lock *optimism.Lock) (bool, error) { failpoint.Inject("SleepWhenRemoveLock", func(val failpoint.Value) { t := val.(int) - log.L().Info("wait new ddl info putted into etcd", + log.L().Info("wait new ddl info putted into etcd in optimistic", zap.String("failpoint", "SleepWhenRemoveLock"), zap.Int("max wait second", t)) diff --git a/dm/dm/master/shardddl/pessimist.go b/dm/dm/master/shardddl/pessimist.go index e20d228097c..e1f44df1e08 100644 --- a/dm/dm/master/shardddl/pessimist.go +++ b/dm/dm/master/shardddl/pessimist.go @@ -645,7 +645,7 @@ func (p *Pessimist) removeLock(lock *pessimism.Lock) error { failpoint.Inject("SleepWhenRemoveLock", func(val failpoint.Value) { t := val.(int) - log.L().Info("wait new ddl info putted into etcd", + log.L().Info("wait new ddl info putted into etcd in pessimistic", zap.String("failpoint", "SleepWhenRemoveLock"), zap.Int("max wait second", t)) diff --git a/dm/tests/shardddl1/run.sh b/dm/tests/shardddl1/run.sh index 4a7583d0976..0b8ed1a536a 100644 --- a/dm/tests/shardddl1/run.sh +++ b/dm/tests/shardddl1/run.sh @@ -242,7 +242,7 @@ function DM_RemoveLock_CASE() { run_sql_source1 "alter table ${shardddl1}.${tb1} add column c double;" run_sql_source2 "alter table ${shardddl1}.${tb1} add column c double;" run_sql_source2 "alter table ${shardddl1}.${tb2} add column c double;" - check_log_contain_with_retry "wait new ddl info putted into etcd" $WORK_DIR/master/log/dm-master.log + check_log_contain_with_retry "wait new ddl info putted into etcd in ${1}" $WORK_DIR/master/log/dm-master.log check_metric_not_contains $MASTER_PORT "dm_master_shard_ddl_error" 3 run_sql_source1 "alter table ${shardddl1}.${tb1} drop column b;"