From d288d30bbd8de4a59beb83f162f0bc2ef2953f66 Mon Sep 17 00:00:00 2001 From: lance6716 Date: Thu, 11 Aug 2022 11:22:06 +0800 Subject: [PATCH 1/2] test(dm): split other test cases Signed-off-by: lance6716 --- dm/tests/others_integration_1.txt | 6 ------ dm/tests/others_integration_2.txt | 5 ----- dm/tests/others_integration_3.txt | 11 +++++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dm/tests/others_integration_1.txt b/dm/tests/others_integration_1.txt index 1cdc1cfd51d..35e50b6dafb 100644 --- a/dm/tests/others_integration_1.txt +++ b/dm/tests/others_integration_1.txt @@ -9,9 +9,3 @@ sequence_sharding_removemeta gtid only_dml adjust_gtid -checkpoint_transaction -lightning_mode -slow_relay_writer -sync_collation -s3_dumpling_lighting -async_checkpoint_flush \ No newline at end of file diff --git a/dm/tests/others_integration_2.txt b/dm/tests/others_integration_2.txt index 3f92ba7a33e..ad88593600f 100644 --- a/dm/tests/others_integration_2.txt +++ b/dm/tests/others_integration_2.txt @@ -8,8 +8,3 @@ sql_mode http_proxies openapi duplicate_event -tracker_ignored_ddl -extend_column -shardddl_optimistic -gbk -new_collation_off diff --git a/dm/tests/others_integration_3.txt b/dm/tests/others_integration_3.txt index e69de29bb2d..43414616647 100644 --- a/dm/tests/others_integration_3.txt +++ b/dm/tests/others_integration_3.txt @@ -0,0 +1,11 @@ +checkpoint_transaction +lightning_mode +slow_relay_writer +sync_collation +s3_dumpling_lighting +async_checkpoint_flush +tracker_ignored_ddl +extend_column +shardddl_optimistic +gbk +new_collation_off From 0309eaec0b8772a930b183cb2c24e0dd9d06ac14 Mon Sep 17 00:00:00 2001 From: lance6716 Date: Thu, 11 Aug 2022 23:18:15 +0800 Subject: [PATCH 2/2] try to fix unstable test Signed-off-by: lance6716 --- dm/tests/checkpoint_transaction/run.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dm/tests/checkpoint_transaction/run.sh b/dm/tests/checkpoint_transaction/run.sh index 0644405b8ae..6445f1d5c35 100755 --- a/dm/tests/checkpoint_transaction/run.sh +++ b/dm/tests/checkpoint_transaction/run.sh @@ -79,10 +79,11 @@ function run() { # start dm-master again task will be resume, and data will be synced run_dm_master $WORK_DIR/master $MASTER_PORT $cur/conf/dm-master.toml check_rpc_alive $cur/../bin/check_master_online 127.0.0.1:$MASTER_PORT + sleep 3 check_sync_diff $WORK_DIR $cur/conf/diff_config.toml run_sql_file $cur/data/db1.increment1.sql $MYSQL_HOST1 $MYSQL_PORT1 $MYSQL_PASSWORD1 # wait transaction start - check_log_contain_with_retry "receive dml job" $WORK_DIR/worker1/log/dm-worker.log + check_log_contain_with_retry "\[32,30,null\]" $WORK_DIR/worker1/log/dm-worker.log echo "pause task and check status" run_dm_ctl $WORK_DIR "127.0.0.1:$MASTER_PORT" \ "pause-task test" \ @@ -123,7 +124,7 @@ function run() { run_sql_file $cur/data/db1.increment2.sql $MYSQL_HOST1 $MYSQL_PORT1 $MYSQL_PASSWORD1 # wait transaction start - check_log_contain_with_retry "receive dml job" $WORK_DIR/worker1/log/dm-worker.log + check_log_contain_with_retry "\[62,null,30\]" $WORK_DIR/worker1/log/dm-worker.log echo "stop task" run_dm_ctl $WORK_DIR "127.0.0.1:$MASTER_PORT" \ "stop-task test" \