Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dm/syncer : fix unstable test in shardddl1 #3471

Merged
merged 2 commits into from
Nov 17, 2021
Merged

dm/syncer : fix unstable test in shardddl1 #3471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cdae43
commit-message: fix instability test in shardddl1
WizardXiao Nov 16, 2021
b4a0f23
Merge branch 'master' into fix-shardddl1
ti-chi-bot Nov 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dm/dm/master/shardddl/optimist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
WizardXiao marked this conversation as resolved.
Show resolved Hide resolved
zap.String("failpoint", "SleepWhenRemoveLock"),
zap.Int("max wait second", t))

Expand Down
2 changes: 1 addition & 1 deletion dm/dm/master/shardddl/pessimist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
2 changes: 1 addition & 1 deletion dm/tests/shardddl1/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;"

Expand Down