retry(dm): align with tidb latest error message (pingcap#4172)

close pingcap#4159, close pingcap#4246
zhaoxinyu · Jan 20, 2022 · fc2eeec · fc2eeec
1 parent 5eaf4f7
commit fc2eeec
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/dm/pkg/retry/errors.go b/dm/pkg/retry/errors.go
@@ -28,6 +28,7 @@ var (
 	// UnsupportedDDLMsgs list the error messages of some unsupported DDL in TiDB.
 	UnsupportedDDLMsgs = []string{
 		"can't drop column with index",
+		"with tidb_enable_change_multi_schema is disable", // https://github.com/pingcap/tidb/pull/29526
 		"unsupported add column",
 		"unsupported modify column",
 		"unsupported modify charset",

diff --git a/dm/syncer/error.go b/dm/syncer/error.go
@@ -57,7 +57,8 @@ func isDropColumnWithIndexError(err error) bool {
 	return (mysqlErr.Number == errno.ErrUnsupportedDDLOperation || mysqlErr.Number == tmysql.ErrUnknown) &&
 		strings.Contains(mysqlErr.Message, "drop column") &&
 		(strings.Contains(mysqlErr.Message, "with index") ||
-			strings.Contains(mysqlErr.Message, "with composite index"))
+			strings.Contains(mysqlErr.Message, "with composite index") ||
+			strings.Contains(mysqlErr.Message, "with tidb_enable_change_multi_schema is disable"))
 }
 
 // handleSpecialDDLError handles special errors for DDL execution.

diff --git a/dm/tests/drop_column_with_index/run.sh b/dm/tests/drop_column_with_index/run.sh
@@ -55,7 +55,7 @@ function run() {
 		"\"isCanceled\": true" 1
 
 	sleep 5
-	check_log_not_contains "dispatch auto resume task" $WORK_DIR/worker1/log/dm-worker.log
+	check_log_not_contains $WORK_DIR/worker1/log/dm-worker.log "dispatch auto resume task"
 
 	run_dm_ctl $WORK_DIR "127.0.0.1:$MASTER_PORT" \
 		"resume-task test" \

diff --git a/dm/tests/others_integration_1.txt b/dm/tests/others_integration_1.txt
@@ -1,3 +1,5 @@
+drop_column_with_index
+downstream_diff_index
 full_mode
 sequence_sharding_optimistic
 sequence_sharding_removemeta