Revert "dm/test: swap upstream and downstream of sync_diff in some ca…

…ses (pingcap#3413)" This reverts commit 35102b5.
lance6716 · Jan 18, 2022 · c540a1a · c540a1a
1 parent 4bfa080
commit c540a1a
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 197 deletions.
diff --git a/dm/tests/adjust_gtid/conf/diff_config_revert_1.toml b/dm/tests/adjust_gtid/conf/diff_config_revert_1.toml
diff --git a/dm/tests/adjust_gtid/conf/diff_config_revert_2.toml b/dm/tests/adjust_gtid/conf/diff_config_revert_2.toml
diff --git a/dm/tests/adjust_gtid/run.sh b/dm/tests/adjust_gtid/run.sh
@@ -85,8 +85,7 @@ function run() {
 		"start-task $WORK_DIR/dm-task.yaml --remove-meta"
 
 	# use sync_diff_inspector to check full dump loader
-	check_sync_diff $WORK_DIR $cur/conf/diff_config_revert_1.toml
-	check_sync_diff $WORK_DIR $cur/conf/diff_config_revert_2.toml
+	check_sync_diff $WORK_DIR $cur/conf/diff_config.toml
 
 	name1=$(grep "Log: " $WORK_DIR/worker1/dumped_data.$TASK_NAME/metadata | awk -F: '{print $2}' | tr -d ' ')
 	pos1=$(grep "Pos: " $WORK_DIR/worker1/dumped_data.$TASK_NAME/metadata | awk -F: '{print $2}' | tr -d ' ')
@@ -128,8 +127,7 @@ function run() {
 	check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER2_PORT
 
 	# use sync_diff_inspector to check incremental dump loader
-	check_sync_diff $WORK_DIR $cur/conf/diff_config_revert_1.toml
-	check_sync_diff $WORK_DIR $cur/conf/diff_config_revert_2.toml
+	check_sync_diff $WORK_DIR $cur/conf/diff_config.toml
 
 	run_sql_both_source "SET @@GLOBAL.SQL_MODE='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION'"
 	run_sql_both_source "SET @@global.time_zone = 'SYSTEM';"

diff --git a/dm/tests/full_mode/conf/diff_config_revert_1.toml b/dm/tests/full_mode/conf/diff_config_revert_1.toml
diff --git a/dm/tests/full_mode/conf/diff_config_revert_2.toml b/dm/tests/full_mode/conf/diff_config_revert_2.toml
diff --git a/dm/tests/full_mode/run.sh b/dm/tests/full_mode/run.sh
@@ -56,7 +56,6 @@ function fail_acquire_global_lock() {
 		"you need (at least one of) the RELOAD privilege(s) for this operation" 2
 
 	cleanup_data full_mode
-	cleanup_data_upstream full_mode
 	cleanup_process $*
 }
 
@@ -101,6 +100,7 @@ function escape_schema() {
 
 	# start DM task only
 	dmctl_start_task "$WORK_DIR/dm-task.yaml" "--remove-meta"
+	check_sync_diff $WORK_DIR $WORK_DIR/diff_config.toml
 
 	check_log_contain_with_retry 'clean dump files' $WORK_DIR/worker1/log/dm-worker.log
 	check_log_contain_with_retry 'clean dump files' $WORK_DIR/worker2/log/dm-worker.log
@@ -114,7 +114,6 @@ function escape_schema() {
 	check_metric $WORKER2_PORT 'dumpling_dump_finished_tables' 3 0 3
 
 	cleanup_data full/mode
-	cleanup_data_upstream full/mode
 	cleanup_process $*
 }
 
@@ -127,8 +126,7 @@ function empty_data() {
 	init_cluster
 
 	dmctl_start_task "$cur/conf/dm-task.yaml" "--remove-meta"
-	check_sync_diff $WORK_DIR $cur/conf/diff_config_revert_1.toml
-	check_sync_diff $WORK_DIR $cur/conf/diff_config_revert_2.toml
+	check_sync_diff $WORK_DIR $cur/conf/diff_config.toml
 
 	sleep 1
 	run_dm_ctl $WORK_DIR "127.0.0.1:$MASTER_PORT" \
@@ -141,7 +139,6 @@ function empty_data() {
 	check_log_contains $WORK_DIR/worker2/log/dm-worker.log "progress=\"100.00 %\""
 
 	cleanup_data full_mode
-	cleanup_data_upstream full_mode
 	cleanup_process $*
 }
 
@@ -190,8 +187,7 @@ function run() {
 	dmctl_start_task "$cur/conf/dm-task.yaml" "--remove-meta"
 
 	# use sync_diff_inspector to check full dump loader
-	check_sync_diff $WORK_DIR $cur/conf/diff_config_revert_1.toml
-	check_sync_diff $WORK_DIR $cur/conf/diff_config_revert_2.toml
+	check_sync_diff $WORK_DIR $cur/conf/diff_config.toml
 
 	echo "check dump files have been cleaned"
 	ls $WORK_DIR/worker1/dumped_data.test && exit 1 || echo "worker1 auto removed dump files"

diff --git a/dm/tests/incremental_mode/conf/diff_config_revert_1.toml b/dm/tests/incremental_mode/conf/diff_config_revert_1.toml
diff --git a/dm/tests/incremental_mode/conf/diff_config_revert_2.toml b/dm/tests/incremental_mode/conf/diff_config_revert_2.toml
diff --git a/dm/tests/incremental_mode/run.sh b/dm/tests/incremental_mode/run.sh
@@ -76,8 +76,7 @@ function run() {
 	sed -i "s/binlog-pos-placeholder-2/4/g" $WORK_DIR/dm-task.yaml
 	dmctl_start_task $WORK_DIR/dm-task.yaml
 
-	check_sync_diff $WORK_DIR $cur/conf/diff_config_revert_1.toml
-	check_sync_diff $WORK_DIR $cur/conf/diff_config_revert_2.toml
+	check_sync_diff $WORK_DIR $cur/conf/diff_config.toml
 
 	dmctl_stop_task $TASK_NAME
 
@@ -266,8 +265,7 @@ function run() {
 		"resume-task test" \
 		"\"result\": true" 3
 
-	check_sync_diff $WORK_DIR $cur/conf/diff_config_revert_1.toml
-	check_sync_diff $WORK_DIR $cur/conf/diff_config_revert_2.toml
+	check_sync_diff $WORK_DIR $cur/conf/diff_config.toml
 
 	# test rotate binlog, after rotate and ddl, master binlog should be equal to sync binlog
 	run_sql "flush logs;" $MYSQL_PORT1 $MYSQL_PASSWORD1