From 9f2329ddf5519f010731b1b167a897af71c2e8e5 Mon Sep 17 00:00:00 2001 From: hongyunyan <649330952@qq.com> Date: Thu, 2 Jan 2025 16:00:18 +0800 Subject: [PATCH] ci: disable integration test`changefeed_pause_resume` (#754) --- .github/workflows/integration_test_mysql.yaml | 8 ++++---- tests/integration_tests/fail_over/run.sh | 8 ++++++-- .../integration_tests/fail_over_ddl_A/run.sh | 16 ++++++++++++---- .../integration_tests/fail_over_ddl_B/run.sh | 16 ++++++++++++---- .../integration_tests/fail_over_ddl_C/run.sh | 16 ++++++++++++---- .../integration_tests/fail_over_ddl_D/run.sh | 16 ++++++++++++---- .../integration_tests/fail_over_ddl_E/run.sh | 19 ++++++++++++------- .../integration_tests/fail_over_ddl_F/run.sh | 17 +++++++++++------ 8 files changed, 81 insertions(+), 35 deletions(-) diff --git a/.github/workflows/integration_test_mysql.yaml b/.github/workflows/integration_test_mysql.yaml index 21c55c5a1..44cb7c52e 100644 --- a/.github/workflows/integration_test_mysql.yaml +++ b/.github/workflows/integration_test_mysql.yaml @@ -61,10 +61,10 @@ jobs: run: | export TICDC_NEWARCH=true && make integration_test CASE=sql_mode - - name: Test changefeed_pause_resume - if: ${{ success() }} - run: | - export TICDC_NEWARCH=true && make integration_test CASE=changefeed_pause_resume + # - name: Test changefeed_pause_resume + # if: ${{ success() }} + # run: | + # export TICDC_NEWARCH=true && make integration_test CASE=changefeed_pause_resume - name: Test changefeed_reconstruct if: ${{ success() }} diff --git a/tests/integration_tests/fail_over/run.sh b/tests/integration_tests/fail_over/run.sh index 1344c8ca6..a381bc96c 100644 --- a/tests/integration_tests/fail_over/run.sh +++ b/tests/integration_tests/fail_over/run.sh @@ -51,8 +51,10 @@ function failOverOnlyOneNode() { kill_cdc_pid $cdc_pid run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY + sleep 15 + check_table_exists fail_over_test.finish_mark ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 export GO_FAILPOINTS='' @@ -108,8 +110,10 @@ function failOverWhenTwoNode() { kill_cdc_pid $cdc_pid_2 run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "1-1" --addr "127.0.0.1:8301" + sleep 15 + check_table_exists fail_over_test.finish_mark ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 export GO_FAILPOINTS='' diff --git a/tests/integration_tests/fail_over_ddl_A/run.sh b/tests/integration_tests/fail_over_ddl_A/run.sh index d31fba302..de46a942e 100644 --- a/tests/integration_tests/fail_over_ddl_A/run.sh +++ b/tests/integration_tests/fail_over_ddl_A/run.sh @@ -93,13 +93,15 @@ function failOverCaseA-1() { run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "0-2" --addr "127.0.0.1:8300" run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "1-2" --addr "127.0.0.1:8301" + sleep 15 + run_sql "show databases;" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains "fail_over_test" ## continue to write ddl and dml to test the cdc server is working well run_sql_file $CUR/data/prepare.sql ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY @@ -137,6 +139,8 @@ function failOverCaseA-2() { run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "0-2" --addr "127.0.0.1:8300" run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "1-2" --addr "127.0.0.1:8301" + sleep 15 + run_sql "use fail_over_ddl_test;show tables;" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains "test1" && check_contains "test2" && @@ -152,7 +156,7 @@ function failOverCaseA-2() { run_sql "insert into fail_over_ddl_test.test2 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} run_sql "insert into fail_over_ddl_test.test3 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY @@ -190,6 +194,8 @@ function failOverCaseA-3() { run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "0-2" --addr "127.0.0.1:8300" run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "1-2" --addr "127.0.0.1:8301" + sleep 15 + run_sql "use fail_over_ddl_test;show tables;" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains "test1" && check_contains "test2" && @@ -207,7 +213,7 @@ function failOverCaseA-3() { run_sql "insert into fail_over_ddl_test.test3 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} run_sql "insert into fail_over_ddl_test.test4 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY @@ -248,6 +254,8 @@ function failOverCaseA-5() { run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "0-2" --addr "127.0.0.1:8300" run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "1-2" --addr "127.0.0.1:8301" + sleep 15 + run_sql "use fail_over_ddl_test;show tables;" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_contains "test1" && check_contains "test2" && @@ -264,7 +272,7 @@ function failOverCaseA-5() { run_sql "insert into fail_over_ddl_test.test2 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} run_sql "insert into fail_over_ddl_test.test3 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY diff --git a/tests/integration_tests/fail_over_ddl_B/run.sh b/tests/integration_tests/fail_over_ddl_B/run.sh index 299707040..ccf3e870a 100644 --- a/tests/integration_tests/fail_over_ddl_B/run.sh +++ b/tests/integration_tests/fail_over_ddl_B/run.sh @@ -108,13 +108,15 @@ function failOverCaseB-1() { # restart cdc server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "0-2" --addr "127.0.0.1:8300" + sleep 15 + run_sql "show databases;" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains "fail_over_test" ## continue to write ddl and dml to test the cdc server is working well run_sql_file $CUR/data/prepare.sql ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY @@ -169,6 +171,8 @@ function failOverCaseB-2() { # restart cdc server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "0-2" --addr "127.0.0.1:8300" + sleep 15 + run_sql "use fail_over_ddl_test;show tables;" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains "test1" && check_contains "test2" @@ -182,7 +186,7 @@ function failOverCaseB-2() { run_sql_file $CUR/data/prepare.sql ${UP_TIDB_HOST} ${UP_TIDB_PORT} run_sql "insert into fail_over_ddl_test.test2 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY @@ -238,6 +242,8 @@ function failOverCaseB-3() { # restart cdc server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "0-2" --addr "127.0.0.1:8300" + sleep 15 + run_sql "use fail_over_ddl_test;show tables;" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains "test1" && check_contains "test2" && @@ -253,7 +259,7 @@ function failOverCaseB-3() { run_sql "insert into fail_over_ddl_test.test2 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} run_sql "insert into fail_over_ddl_test.test4 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY export GO_FAILPOINTS='' @@ -311,6 +317,8 @@ function failOverCaseB-5() { # restart cdc server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "0-2" --addr "127.0.0.1:8300" + sleep 15 + run_sql "use fail_over_ddl_test;show tables;" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_contains "test1" && check_contains "test2" @@ -325,7 +333,7 @@ function failOverCaseB-5() { run_sql "insert into fail_over_ddl_test.test1 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} run_sql "insert into fail_over_ddl_test.test2 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY export GO_FAILPOINTS='' diff --git a/tests/integration_tests/fail_over_ddl_C/run.sh b/tests/integration_tests/fail_over_ddl_C/run.sh index 9dcd3e5bc..ee38dac8c 100644 --- a/tests/integration_tests/fail_over_ddl_C/run.sh +++ b/tests/integration_tests/fail_over_ddl_C/run.sh @@ -110,13 +110,15 @@ function failOverCaseC-1() { # restart cdc server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "1-2" --addr "127.0.0.1:8301" + sleep 15 + run_sql "show databases;" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains "fail_over_test" ## continue to write ddl and dml to test the cdc server is working well run_sql_file $CUR/data/prepare.sql ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY @@ -171,6 +173,8 @@ function failOverCaseC-2() { # restart cdc server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "1-2" --addr "127.0.0.1:8301" + sleep 15 + run_sql "use fail_over_ddl_test;show tables;" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains "test1" && check_contains "test2" @@ -184,7 +188,7 @@ function failOverCaseC-2() { run_sql_file $CUR/data/prepare.sql ${UP_TIDB_HOST} ${UP_TIDB_PORT} run_sql "insert into fail_over_ddl_test.test2 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY @@ -240,6 +244,8 @@ function failOverCaseC-3() { # restart cdc server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "1-2" --addr "127.0.0.1:8301" + sleep 15 + run_sql "use fail_over_ddl_test;show tables;" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains "test1" && check_contains "test2" && @@ -255,7 +261,7 @@ function failOverCaseC-3() { run_sql "insert into fail_over_ddl_test.test2 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} run_sql "insert into fail_over_ddl_test.test4 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY export GO_FAILPOINTS='' @@ -313,6 +319,8 @@ function failOverCaseC-5() { # restart cdc server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "1-2" --addr "127.0.0.1:8301" + sleep 15 + run_sql "use fail_over_ddl_test;show tables;" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_contains "test1" && check_contains "test2" @@ -327,7 +335,7 @@ function failOverCaseC-5() { run_sql "insert into fail_over_ddl_test.test1 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} run_sql "insert into fail_over_ddl_test.test2 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY export GO_FAILPOINTS='' diff --git a/tests/integration_tests/fail_over_ddl_D/run.sh b/tests/integration_tests/fail_over_ddl_D/run.sh index 0b188e3f5..8d30e7640 100644 --- a/tests/integration_tests/fail_over_ddl_D/run.sh +++ b/tests/integration_tests/fail_over_ddl_D/run.sh @@ -92,12 +92,14 @@ function failOverCaseD-1() { run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "0-2" --addr "127.0.0.1:8300" run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "1-2" --addr "127.0.0.1:8301" + sleep 15 + ensure 30 "run_sql 'show databases;' ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains 'fail_over_ddl_test'" ## continue to write ddl and dml to test the cdc server is working well run_sql_file $CUR/data/prepare.sql ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY @@ -135,6 +137,8 @@ function failOverCaseD-2() { run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "0-2" --addr "127.0.0.1:8300" run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "1-2" --addr "127.0.0.1:8301" + sleep 15 + ensure 30 "run_sql 'use fail_over_ddl_test;show tables;' ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains 'test1'" run_sql "use fail_over_ddl_test;show tables;" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && @@ -150,7 +154,7 @@ function failOverCaseD-2() { run_sql_file $CUR/data/prepare.sql ${UP_TIDB_HOST} ${UP_TIDB_PORT} run_sql "insert into fail_over_ddl_test.test2 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY @@ -188,6 +192,8 @@ function failOverCaseD-3() { run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "0-2" --addr "127.0.0.1:8300" run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "1-2" --addr "127.0.0.1:8301" + sleep 15 + ## make ddl must reach the place and report to maintainer, and get the write status, and block in the place that report to maintainer ensure 30 "run_sql 'use fail_over_ddl_test;show tables;' ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains 'test1' && check_contains 'test4'" @@ -206,7 +212,7 @@ function failOverCaseD-3() { run_sql "insert into fail_over_ddl_test.test2 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} run_sql "insert into fail_over_ddl_test.test4 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY @@ -249,6 +255,8 @@ function failOverCaseD-5() { ## make ddl must reach the place and report to maintainer, and get the write status, and block in the place that report to maintainer ensure 30 "run_sql 'select id from fail_over_ddl_test.test1;' ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains '2'" + + sleep 15 run_sql "use fail_over_ddl_test;show tables;" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_contains "test1" && @@ -264,7 +272,7 @@ function failOverCaseD-5() { run_sql "insert into fail_over_ddl_test.test1 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} run_sql "insert into fail_over_ddl_test.test2 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY diff --git a/tests/integration_tests/fail_over_ddl_E/run.sh b/tests/integration_tests/fail_over_ddl_E/run.sh index 1bdac3aeb..e52fb00a2 100644 --- a/tests/integration_tests/fail_over_ddl_E/run.sh +++ b/tests/integration_tests/fail_over_ddl_E/run.sh @@ -108,13 +108,15 @@ function failOverCaseE-1() { # restart cdc server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "0-2" --addr "127.0.0.1:8300" + sleep 15 + ## make ddl must reach the place and report to maintainer, and get the write status, and block in the place that report to maintainer ensure 30 "run_sql 'show databases;' ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains 'fail_over_ddl_test'" ## continue to write ddl and dml to test the cdc server is working well run_sql_file $CUR/data/prepare.sql ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY @@ -168,6 +170,7 @@ function failOverCaseE-2() { # restart cdc server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "0-2" --addr "127.0.0.1:8300" + sleep 15 ## make ddl must reach the place and report to maintainer, and get the write status, and block in the place that report to maintainer ensure 30 "run_sql 'use fail_over_ddl_test;show tables;' ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains 'test1'" @@ -184,7 +187,7 @@ function failOverCaseE-2() { run_sql_file $CUR/data/prepare.sql ${UP_TIDB_HOST} ${UP_TIDB_PORT} run_sql "insert into fail_over_ddl_test.test2 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY @@ -238,8 +241,9 @@ function failOverCaseE-3() { kill_cdc_pid $cdc_pid_1 # restart cdc server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "0-2" --addr "127.0.0.1:8300" - - ## make ddl must reach the place and report to maintainer, and get the write status, and block in the place that report to maintainer + + sleep 15 + ## make ddl must reach the place and report to maintainer, and get the write status, and block in the place that report to maintainer ensure 30 "run_sql 'use fail_over_ddl_test;show tables;' ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains 'test1' && check_contains 'test4'" run_sql "use fail_over_ddl_test;show tables;" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && @@ -257,7 +261,7 @@ function failOverCaseE-3() { run_sql "insert into fail_over_ddl_test.test2 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} run_sql "insert into fail_over_ddl_test.test4 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY export GO_FAILPOINTS='' @@ -314,7 +318,8 @@ function failOverCaseE-5() { # restart cdc server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "0-2" --addr "127.0.0.1:8300" - ## make ddl must reach the place and report to maintainer, and get the write status, and block in the place that report to maintainer + sleep 15 + ## make ddl must reach the place and report to maintainer, and get the write status, and block in the place that report to maintainer ensure 30 "run_sql 'select id from fail_over_ddl_test.test1;' ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains '2'" run_sql "use fail_over_ddl_test;show tables;" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && @@ -331,7 +336,7 @@ function failOverCaseE-5() { run_sql "insert into fail_over_ddl_test.test1 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} run_sql "insert into fail_over_ddl_test.test2 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY export GO_FAILPOINTS='' diff --git a/tests/integration_tests/fail_over_ddl_F/run.sh b/tests/integration_tests/fail_over_ddl_F/run.sh index 3c0217298..e359e918b 100644 --- a/tests/integration_tests/fail_over_ddl_F/run.sh +++ b/tests/integration_tests/fail_over_ddl_F/run.sh @@ -111,6 +111,8 @@ function failOverCaseF-1() { # restart cdc server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "1-2" --addr "127.0.0.1:8301" + sleep 15 + ## make ddl must reach the place and report to maintainer, and get the write status, and block in the place that report to maintainer ensure 30 "run_sql 'show databases;' ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains 'fail_over_ddl_test'" @@ -120,7 +122,7 @@ function failOverCaseF-1() { ## continue to write ddl and dml to test the cdc server is working well run_sql_file $CUR/data/prepare.sql ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY @@ -174,7 +176,8 @@ function failOverCaseF-2() { # restart cdc server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "1-2" --addr "127.0.0.1:8301" - ## make ddl must reach the place and report to maintainer, and get the write status, and block in the place that report to maintainer + sleep 15 + ## make ddl must reach the place and report to maintainer, and get the write status, and block in the place that report to maintainer ensure 30 "run_sql 'use fail_over_ddl_test;show tables;' ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains 'test1'" run_sql "use fail_over_ddl_test;show tables;" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && @@ -190,7 +193,7 @@ function failOverCaseF-2() { run_sql_file $CUR/data/prepare.sql ${UP_TIDB_HOST} ${UP_TIDB_PORT} run_sql "insert into fail_over_ddl_test.test2 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY @@ -245,7 +248,8 @@ function failOverCaseF-3() { # restart cdc server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "1-2" --addr "127.0.0.1:8301" - ## make ddl must reach the place and report to maintainer, and get the write status, and block in the place that report to maintainer + sleep 15 + ## make ddl must reach the place and report to maintainer, and get the write status, and block in the place that report to maintainer ensure 30 "run_sql 'use fail_over_ddl_test;show tables;' ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains 'test1' && check_contains 'test4'" run_sql "use fail_over_ddl_test;show tables;" ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && @@ -263,7 +267,7 @@ function failOverCaseF-3() { run_sql "insert into fail_over_ddl_test.test2 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} run_sql "insert into fail_over_ddl_test.test4 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY export GO_FAILPOINTS='' @@ -320,6 +324,7 @@ function failOverCaseF-5() { # restart cdc server run_cdc_server --workdir $WORK_DIR --binary $CDC_BINARY --logsuffix "1-2" --addr "127.0.0.1:8301" + sleep 15 ## make ddl must reach the place and report to maintainer, and get the write status, and block in the place that report to maintainer ensure 30 "run_sql 'select id from fail_over_ddl_test.test1;' ${DOWN_TIDB_HOST} ${DOWN_TIDB_PORT} && check_not_contains '2'" @@ -337,7 +342,7 @@ function failOverCaseF-5() { run_sql "insert into fail_over_ddl_test.test1 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} run_sql "insert into fail_over_ddl_test.test2 values (1, 1);" ${UP_TIDB_HOST} ${UP_TIDB_PORT} - check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml + check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml 60 cleanup_process $CDC_BINARY export GO_FAILPOINTS=''