From 1bc079c10e06344c754dcbd4d22a569900aedee0 Mon Sep 17 00:00:00 2001 From: lance6716 Date: Thu, 30 Dec 2021 15:18:51 +0800 Subject: [PATCH 1/7] *(both): replace set -e to set -ru --- .../roles/alertmanager/templates/run_alertmanager.sh.j2 | 2 +- dm/dm/dm-ansible/roles/dm-master/templates/run_dm-master.sh.j2 | 2 +- dm/dm/dm-ansible/roles/dm-portal/templates/run_dm-portal.sh.j2 | 2 +- dm/dm/dm-ansible/roles/dm-worker/templates/run_dm-worker.sh.j2 | 2 +- dm/dm/dm-ansible/roles/grafana/templates/run_grafana.sh.j2 | 2 +- .../dm-ansible/roles/prometheus/templates/run_prometheus.sh.j2 | 2 +- dm/dm/dm-ansible/roles/systemd/templates/start_role.sh.j2 | 2 +- dm/dm/dm-ansible/roles/systemd/templates/stop_role.sh.j2 | 2 +- tests/integration_tests/_utils/run_cdc_server | 2 +- tests/integration_tests/_utils/run_kafka_consumer | 2 +- tests/integration_tests/_utils/run_sql | 2 +- tests/integration_tests/_utils/run_sql_file | 2 +- tests/integration_tests/_utils/start_tidb_cluster | 2 +- tests/integration_tests/_utils/start_tidb_cluster_impl | 2 +- tests/integration_tests/_utils/start_tls_tidb_cluster | 2 +- tests/integration_tests/_utils/start_tls_tidb_cluster_impl | 2 +- tests/integration_tests/autorandom/run.sh | 2 +- tests/integration_tests/availability/capture.sh | 2 +- tests/integration_tests/availability/owner.sh | 2 +- tests/integration_tests/availability/processor.sh | 2 +- tests/integration_tests/availability/run.sh | 2 +- tests/integration_tests/bank/run.sh | 2 +- tests/integration_tests/batch_add_table/run.sh | 2 +- tests/integration_tests/capture_session_done_during_task/run.sh | 2 +- .../capture_suicide_while_balance_table/run.sh | 2 +- tests/integration_tests/cdc/run.sh | 2 +- tests/integration_tests/changefeed_auto_stop/run.sh | 2 +- tests/integration_tests/changefeed_error/run.sh | 2 +- tests/integration_tests/changefeed_fast_fail/run.sh | 2 +- tests/integration_tests/changefeed_finish/run.sh | 2 +- tests/integration_tests/changefeed_pause_resume/run.sh | 2 +- tests/integration_tests/changefeed_reconstruct/run.sh | 2 +- tests/integration_tests/cli/run.sh | 2 +- tests/integration_tests/clustered_index/run.sh | 2 +- tests/integration_tests/common_1/run.sh | 2 +- tests/integration_tests/consistent_replicate_nfs/run.sh | 2 +- tests/integration_tests/consistent_replicate_s3/run.sh | 2 +- tests/integration_tests/cyclic_ab/run.sh | 2 +- tests/integration_tests/cyclic_abc/run.sh | 2 +- tests/integration_tests/ddl_attributes/run.sh | 2 +- tests/integration_tests/ddl_puller_lag/run.sh | 2 +- tests/integration_tests/ddl_reentrant/run.sh | 2 +- tests/integration_tests/ddl_sequence/run.sh | 2 +- tests/integration_tests/drop_many_tables/run.sh | 2 +- tests/integration_tests/force_replicate_table/run.sh | 2 +- tests/integration_tests/gc_safepoint/run.sh | 2 +- tests/integration_tests/generate_column/run.sh | 2 +- tests/integration_tests/http_api/run.sh | 2 +- tests/integration_tests/kafka_big_messages/run.sh | 2 +- tests/integration_tests/kafka_messages/run.sh | 2 +- tests/integration_tests/kafka_sink_error_resume/run.sh | 2 +- tests/integration_tests/kill_owner_with_ddl/run.sh | 2 +- tests/integration_tests/kv_client_stream_reconnect/run.sh | 2 +- tests/integration_tests/many_pk_or_uk/run.sh | 2 +- tests/integration_tests/move_table/run.sh | 2 +- tests/integration_tests/multi_capture/run.sh | 2 +- tests/integration_tests/multi_changefeed/run.sh | 2 +- tests/integration_tests/multi_source/run.sh | 2 +- tests/integration_tests/new_ci_collation_with_old_value/run.sh | 2 +- .../integration_tests/new_ci_collation_without_old_value/run.sh | 2 +- tests/integration_tests/owner_remove_table_error/run.sh | 2 +- tests/integration_tests/partition_table/run.sh | 2 +- tests/integration_tests/processor_err_chan/run.sh | 2 +- tests/integration_tests/processor_panic/run.sh | 2 +- tests/integration_tests/processor_resolved_ts_fallback/run.sh | 2 +- tests/integration_tests/processor_stop_delay/run.sh | 2 +- tests/integration_tests/region_merge/run.sh | 2 +- tests/integration_tests/resolve_lock/run.sh | 2 +- tests/integration_tests/row_format/run.sh | 2 +- tests/integration_tests/simple/run.sh | 2 +- tests/integration_tests/sink_hang/run.sh | 2 +- tests/integration_tests/sink_retry/run.sh | 2 +- tests/integration_tests/sorter/run.sh | 2 +- tests/integration_tests/split_region/run.sh | 2 +- tests/integration_tests/syncpoint/run.sh | 2 +- tests/integration_tests/tiflash/run.sh | 2 +- 76 files changed, 76 insertions(+), 76 deletions(-) diff --git a/dm/dm/dm-ansible/roles/alertmanager/templates/run_alertmanager.sh.j2 b/dm/dm/dm-ansible/roles/alertmanager/templates/run_alertmanager.sh.j2 index 72ccff6fca3..170258039a3 100755 --- a/dm/dm/dm-ansible/roles/alertmanager/templates/run_alertmanager.sh.j2 +++ b/dm/dm/dm-ansible/roles/alertmanager/templates/run_alertmanager.sh.j2 @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -eu ulimit -n 1000000 DEPLOY_DIR={{ deploy_dir }} diff --git a/dm/dm/dm-ansible/roles/dm-master/templates/run_dm-master.sh.j2 b/dm/dm/dm-ansible/roles/dm-master/templates/run_dm-master.sh.j2 index c2c09dd2e34..14159e5141e 100755 --- a/dm/dm/dm-ansible/roles/dm-master/templates/run_dm-master.sh.j2 +++ b/dm/dm/dm-ansible/roles/dm-master/templates/run_dm-master.sh.j2 @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -eu ulimit -n 1000000 DEPLOY_DIR={{ deploy_dir }} diff --git a/dm/dm/dm-ansible/roles/dm-portal/templates/run_dm-portal.sh.j2 b/dm/dm/dm-ansible/roles/dm-portal/templates/run_dm-portal.sh.j2 index bd09da8e61b..bc47d05476e 100755 --- a/dm/dm/dm-ansible/roles/dm-portal/templates/run_dm-portal.sh.j2 +++ b/dm/dm/dm-ansible/roles/dm-portal/templates/run_dm-portal.sh.j2 @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -eu ulimit -n 1000000 DEPLOY_DIR={{ deploy_dir }} diff --git a/dm/dm/dm-ansible/roles/dm-worker/templates/run_dm-worker.sh.j2 b/dm/dm/dm-ansible/roles/dm-worker/templates/run_dm-worker.sh.j2 index 4578b2cbf92..8235a0e323e 100755 --- a/dm/dm/dm-ansible/roles/dm-worker/templates/run_dm-worker.sh.j2 +++ b/dm/dm/dm-ansible/roles/dm-worker/templates/run_dm-worker.sh.j2 @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -eu ulimit -n 1000000 DEPLOY_DIR={{ deploy_dir }} diff --git a/dm/dm/dm-ansible/roles/grafana/templates/run_grafana.sh.j2 b/dm/dm/dm-ansible/roles/grafana/templates/run_grafana.sh.j2 index 0d87330cdb7..d245e27486f 100755 --- a/dm/dm/dm-ansible/roles/grafana/templates/run_grafana.sh.j2 +++ b/dm/dm/dm-ansible/roles/grafana/templates/run_grafana.sh.j2 @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -eu ulimit -n 1000000 # WARNING: This file was auto-generated. Do not edit! diff --git a/dm/dm/dm-ansible/roles/prometheus/templates/run_prometheus.sh.j2 b/dm/dm/dm-ansible/roles/prometheus/templates/run_prometheus.sh.j2 index 9079000b69f..d4c79a24e47 100755 --- a/dm/dm/dm-ansible/roles/prometheus/templates/run_prometheus.sh.j2 +++ b/dm/dm/dm-ansible/roles/prometheus/templates/run_prometheus.sh.j2 @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -eu ulimit -n 1000000 DEPLOY_DIR={{ deploy_dir }} diff --git a/dm/dm/dm-ansible/roles/systemd/templates/start_role.sh.j2 b/dm/dm/dm-ansible/roles/systemd/templates/start_role.sh.j2 index 62a7f39bb4d..f6d89339b73 100755 --- a/dm/dm/dm-ansible/roles/systemd/templates/start_role.sh.j2 +++ b/dm/dm/dm-ansible/roles/systemd/templates/start_role.sh.j2 @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -eu # WARNING: This file was auto-generated. Do not edit! # All your edit might be overwritten! diff --git a/dm/dm/dm-ansible/roles/systemd/templates/stop_role.sh.j2 b/dm/dm/dm-ansible/roles/systemd/templates/stop_role.sh.j2 index 08e436d450a..9fa884db006 100755 --- a/dm/dm/dm-ansible/roles/systemd/templates/stop_role.sh.j2 +++ b/dm/dm/dm-ansible/roles/systemd/templates/stop_role.sh.j2 @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -eu # WARNING: This file was auto-generated. Do not edit! # All your edit might be overwritten! diff --git a/tests/integration_tests/_utils/run_cdc_server b/tests/integration_tests/_utils/run_cdc_server index dd3396c2fe4..a495c41ed03 100755 --- a/tests/integration_tests/_utils/run_cdc_server +++ b/tests/integration_tests/_utils/run_cdc_server @@ -8,7 +8,7 @@ # --addr: address # --pd: pd address -set -e +set -eu workdir= tls= diff --git a/tests/integration_tests/_utils/run_kafka_consumer b/tests/integration_tests/_utils/run_kafka_consumer index ead9d0bc685..4045291bbdd 100755 --- a/tests/integration_tests/_utils/run_kafka_consumer +++ b/tests/integration_tests/_utils/run_kafka_consumer @@ -4,7 +4,7 @@ # parameter 2: sink-uri # parameter 3: log suffix -set -e +set -eu workdir=$1 sink_uri=$2 diff --git a/tests/integration_tests/_utils/run_sql b/tests/integration_tests/_utils/run_sql index 0e616f16a0c..8548e995b1a 100755 --- a/tests/integration_tests/_utils/run_sql +++ b/tests/integration_tests/_utils/run_sql @@ -4,7 +4,7 @@ # parameter 3: database port # parameter 4: other mysql client settings -set -e +set -eu sql=${1} diff --git a/tests/integration_tests/_utils/run_sql_file b/tests/integration_tests/_utils/run_sql_file index f128d055609..7fca6e20200 100755 --- a/tests/integration_tests/_utils/run_sql_file +++ b/tests/integration_tests/_utils/run_sql_file @@ -3,7 +3,7 @@ # parameter 2: database host # parameter 3: database port -set -e +set -eu echo "[$(date)] Executing SQL: $1" >"$OUT_DIR/sql_res.$TEST_NAME.txt" mysql -uroot -h$2 -P$3 --default-character-set utf8mb4 -vv <"$1" >>"$OUT_DIR/sql_res.$TEST_NAME.txt" diff --git a/tests/integration_tests/_utils/start_tidb_cluster b/tests/integration_tests/_utils/start_tidb_cluster index c9608b88d4f..48f2de56bd1 100755 --- a/tests/integration_tests/_utils/start_tidb_cluster +++ b/tests/integration_tests/_utils/start_tidb_cluster @@ -4,7 +4,7 @@ # --tidb-config: path to tidb config file # --retry: retry times -set -e +set -eu OUT_DIR= tidb_config= diff --git a/tests/integration_tests/_utils/start_tidb_cluster_impl b/tests/integration_tests/_utils/start_tidb_cluster_impl index 82d36de3a5a..c575b18599a 100755 --- a/tests/integration_tests/_utils/start_tidb_cluster_impl +++ b/tests/integration_tests/_utils/start_tidb_cluster_impl @@ -4,7 +4,7 @@ # --tidb-config: path to tidb config file # --multiple-upstream-pd: whether to deploy multiple pd severs in upstream -set -e +set -eu OUT_DIR= tidb_config= diff --git a/tests/integration_tests/_utils/start_tls_tidb_cluster b/tests/integration_tests/_utils/start_tls_tidb_cluster index 5f3e715bbd8..b8dfd012ef0 100755 --- a/tests/integration_tests/_utils/start_tls_tidb_cluster +++ b/tests/integration_tests/_utils/start_tls_tidb_cluster @@ -4,7 +4,7 @@ # --tlsdir: certificates directory # --retry: retry times -set -e +set -eu OUT_DIR= TLS_DIR= diff --git a/tests/integration_tests/_utils/start_tls_tidb_cluster_impl b/tests/integration_tests/_utils/start_tls_tidb_cluster_impl index da31694e5a8..e742babeb61 100755 --- a/tests/integration_tests/_utils/start_tls_tidb_cluster_impl +++ b/tests/integration_tests/_utils/start_tls_tidb_cluster_impl @@ -3,7 +3,7 @@ # --workdir: work directory # --tlsdir: certificates directory -set -e +set -eu OUT_DIR= TLS_DIR= diff --git a/tests/integration_tests/autorandom/run.sh b/tests/integration_tests/autorandom/run.sh index 1260bcc5557..a811c5b1048 100644 --- a/tests/integration_tests/autorandom/run.sh +++ b/tests/integration_tests/autorandom/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/availability/capture.sh b/tests/integration_tests/availability/capture.sh index 3cd1fd5fb39..f0d033c7125 100755 --- a/tests/integration_tests/availability/capture.sh +++ b/tests/integration_tests/availability/capture.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/availability/owner.sh b/tests/integration_tests/availability/owner.sh index d8975521862..ba869f30113 100755 --- a/tests/integration_tests/availability/owner.sh +++ b/tests/integration_tests/availability/owner.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/availability/processor.sh b/tests/integration_tests/availability/processor.sh index 121eb26a733..3162b554b7d 100644 --- a/tests/integration_tests/availability/processor.sh +++ b/tests/integration_tests/availability/processor.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/availability/run.sh b/tests/integration_tests/availability/run.sh index 36ac89df1ac..6684c1b8ca2 100644 --- a/tests/integration_tests/availability/run.sh +++ b/tests/integration_tests/availability/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/bank/run.sh b/tests/integration_tests/bank/run.sh index 62ead2a0745..d883e16dc01 100644 --- a/tests/integration_tests/bank/run.sh +++ b/tests/integration_tests/bank/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/batch_add_table/run.sh b/tests/integration_tests/batch_add_table/run.sh index 0978027b7be..3cf1e9cd090 100644 --- a/tests/integration_tests/batch_add_table/run.sh +++ b/tests/integration_tests/batch_add_table/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/capture_session_done_during_task/run.sh b/tests/integration_tests/capture_session_done_during_task/run.sh index ac42c3df067..8c2c0eeab56 100644 --- a/tests/integration_tests/capture_session_done_during_task/run.sh +++ b/tests/integration_tests/capture_session_done_during_task/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/capture_suicide_while_balance_table/run.sh b/tests/integration_tests/capture_suicide_while_balance_table/run.sh index 3accdee5b4f..7b9ce88f43e 100644 --- a/tests/integration_tests/capture_suicide_while_balance_table/run.sh +++ b/tests/integration_tests/capture_suicide_while_balance_table/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/cdc/run.sh b/tests/integration_tests/cdc/run.sh index e9eed66427b..430fd4ff295 100755 --- a/tests/integration_tests/cdc/run.sh +++ b/tests/integration_tests/cdc/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/changefeed_auto_stop/run.sh b/tests/integration_tests/changefeed_auto_stop/run.sh index 305fe9e4528..de21c8010a3 100755 --- a/tests/integration_tests/changefeed_auto_stop/run.sh +++ b/tests/integration_tests/changefeed_auto_stop/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/changefeed_error/run.sh b/tests/integration_tests/changefeed_error/run.sh index 28d62dda939..0fffa766852 100755 --- a/tests/integration_tests/changefeed_error/run.sh +++ b/tests/integration_tests/changefeed_error/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/changefeed_fast_fail/run.sh b/tests/integration_tests/changefeed_fast_fail/run.sh index a5bdaa60d17..81992fb5232 100644 --- a/tests/integration_tests/changefeed_fast_fail/run.sh +++ b/tests/integration_tests/changefeed_fast_fail/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/changefeed_finish/run.sh b/tests/integration_tests/changefeed_finish/run.sh index 58cf6be60ee..f9244bf56e3 100755 --- a/tests/integration_tests/changefeed_finish/run.sh +++ b/tests/integration_tests/changefeed_finish/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/changefeed_pause_resume/run.sh b/tests/integration_tests/changefeed_pause_resume/run.sh index 5ecbb82db91..4dcdb074ef5 100755 --- a/tests/integration_tests/changefeed_pause_resume/run.sh +++ b/tests/integration_tests/changefeed_pause_resume/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/changefeed_reconstruct/run.sh b/tests/integration_tests/changefeed_reconstruct/run.sh index 439077dc189..1fe112b3beb 100755 --- a/tests/integration_tests/changefeed_reconstruct/run.sh +++ b/tests/integration_tests/changefeed_reconstruct/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/cli/run.sh b/tests/integration_tests/cli/run.sh index feebb2a24de..6d42258bfbb 100644 --- a/tests/integration_tests/cli/run.sh +++ b/tests/integration_tests/cli/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/clustered_index/run.sh b/tests/integration_tests/clustered_index/run.sh index b16ceb53314..dcb3c677ea2 100755 --- a/tests/integration_tests/clustered_index/run.sh +++ b/tests/integration_tests/clustered_index/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/common_1/run.sh b/tests/integration_tests/common_1/run.sh index d7512d3121c..8bc55a8354f 100644 --- a/tests/integration_tests/common_1/run.sh +++ b/tests/integration_tests/common_1/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/consistent_replicate_nfs/run.sh b/tests/integration_tests/consistent_replicate_nfs/run.sh index 3ffaf788638..0a892b46a17 100644 --- a/tests/integration_tests/consistent_replicate_nfs/run.sh +++ b/tests/integration_tests/consistent_replicate_nfs/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/consistent_replicate_s3/run.sh b/tests/integration_tests/consistent_replicate_s3/run.sh index 253244cfc8c..3fd85fbd293 100644 --- a/tests/integration_tests/consistent_replicate_s3/run.sh +++ b/tests/integration_tests/consistent_replicate_s3/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/cyclic_ab/run.sh b/tests/integration_tests/cyclic_ab/run.sh index 38baacfdcca..ef760d80a0c 100644 --- a/tests/integration_tests/cyclic_ab/run.sh +++ b/tests/integration_tests/cyclic_ab/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/cyclic_abc/run.sh b/tests/integration_tests/cyclic_abc/run.sh index 5c8a3eb5028..6ed178f2952 100644 --- a/tests/integration_tests/cyclic_abc/run.sh +++ b/tests/integration_tests/cyclic_abc/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/ddl_attributes/run.sh b/tests/integration_tests/ddl_attributes/run.sh index a8e8a7a65ab..6e6b02058fe 100644 --- a/tests/integration_tests/ddl_attributes/run.sh +++ b/tests/integration_tests/ddl_attributes/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/ddl_puller_lag/run.sh b/tests/integration_tests/ddl_puller_lag/run.sh index 959deee203c..6b7e790acce 100644 --- a/tests/integration_tests/ddl_puller_lag/run.sh +++ b/tests/integration_tests/ddl_puller_lag/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/ddl_reentrant/run.sh b/tests/integration_tests/ddl_reentrant/run.sh index 58dfc2b7114..cb314579952 100644 --- a/tests/integration_tests/ddl_reentrant/run.sh +++ b/tests/integration_tests/ddl_reentrant/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/ddl_sequence/run.sh b/tests/integration_tests/ddl_sequence/run.sh index 07bb628ab9a..3808a551dc9 100644 --- a/tests/integration_tests/ddl_sequence/run.sh +++ b/tests/integration_tests/ddl_sequence/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/drop_many_tables/run.sh b/tests/integration_tests/drop_many_tables/run.sh index ccfcd6e6957..295e604a2f3 100644 --- a/tests/integration_tests/drop_many_tables/run.sh +++ b/tests/integration_tests/drop_many_tables/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/force_replicate_table/run.sh b/tests/integration_tests/force_replicate_table/run.sh index fe2816e3bf2..29945a620c6 100755 --- a/tests/integration_tests/force_replicate_table/run.sh +++ b/tests/integration_tests/force_replicate_table/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/gc_safepoint/run.sh b/tests/integration_tests/gc_safepoint/run.sh index 46165f1195d..b272916ccfb 100755 --- a/tests/integration_tests/gc_safepoint/run.sh +++ b/tests/integration_tests/gc_safepoint/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/generate_column/run.sh b/tests/integration_tests/generate_column/run.sh index 6ddbc25e246..a6d864a62c3 100644 --- a/tests/integration_tests/generate_column/run.sh +++ b/tests/integration_tests/generate_column/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/http_api/run.sh b/tests/integration_tests/http_api/run.sh index ecd8a8bab2e..e2d364dbfbc 100644 --- a/tests/integration_tests/http_api/run.sh +++ b/tests/integration_tests/http_api/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/kafka_big_messages/run.sh b/tests/integration_tests/kafka_big_messages/run.sh index 0b10c780c43..40698eb0466 100755 --- a/tests/integration_tests/kafka_big_messages/run.sh +++ b/tests/integration_tests/kafka_big_messages/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/kafka_messages/run.sh b/tests/integration_tests/kafka_messages/run.sh index 5f89c04b421..a5a03449d8e 100755 --- a/tests/integration_tests/kafka_messages/run.sh +++ b/tests/integration_tests/kafka_messages/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/kafka_sink_error_resume/run.sh b/tests/integration_tests/kafka_sink_error_resume/run.sh index 0560852fa6b..dc1300507d8 100755 --- a/tests/integration_tests/kafka_sink_error_resume/run.sh +++ b/tests/integration_tests/kafka_sink_error_resume/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/kill_owner_with_ddl/run.sh b/tests/integration_tests/kill_owner_with_ddl/run.sh index b13f8dbc8fc..8d8a9b386f9 100755 --- a/tests/integration_tests/kill_owner_with_ddl/run.sh +++ b/tests/integration_tests/kill_owner_with_ddl/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/kv_client_stream_reconnect/run.sh b/tests/integration_tests/kv_client_stream_reconnect/run.sh index ac01e967428..3989786cb4e 100644 --- a/tests/integration_tests/kv_client_stream_reconnect/run.sh +++ b/tests/integration_tests/kv_client_stream_reconnect/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/many_pk_or_uk/run.sh b/tests/integration_tests/many_pk_or_uk/run.sh index e1da4c9f4d4..4cb7e823647 100755 --- a/tests/integration_tests/many_pk_or_uk/run.sh +++ b/tests/integration_tests/many_pk_or_uk/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/move_table/run.sh b/tests/integration_tests/move_table/run.sh index edd0b005662..edc9e1da0a7 100644 --- a/tests/integration_tests/move_table/run.sh +++ b/tests/integration_tests/move_table/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/multi_capture/run.sh b/tests/integration_tests/multi_capture/run.sh index 6b54c9186e7..649ba188f0a 100755 --- a/tests/integration_tests/multi_capture/run.sh +++ b/tests/integration_tests/multi_capture/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/multi_changefeed/run.sh b/tests/integration_tests/multi_changefeed/run.sh index 8027cbb5bd7..3cca6363425 100755 --- a/tests/integration_tests/multi_changefeed/run.sh +++ b/tests/integration_tests/multi_changefeed/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/multi_source/run.sh b/tests/integration_tests/multi_source/run.sh index 1c38616dfb6..615deae94f2 100755 --- a/tests/integration_tests/multi_source/run.sh +++ b/tests/integration_tests/multi_source/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/new_ci_collation_with_old_value/run.sh b/tests/integration_tests/new_ci_collation_with_old_value/run.sh index 8df0ddf9a99..ec7f55afe2d 100755 --- a/tests/integration_tests/new_ci_collation_with_old_value/run.sh +++ b/tests/integration_tests/new_ci_collation_with_old_value/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/new_ci_collation_without_old_value/run.sh b/tests/integration_tests/new_ci_collation_without_old_value/run.sh index fbc0fd3f55c..24534849954 100755 --- a/tests/integration_tests/new_ci_collation_without_old_value/run.sh +++ b/tests/integration_tests/new_ci_collation_without_old_value/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/owner_remove_table_error/run.sh b/tests/integration_tests/owner_remove_table_error/run.sh index 5ba75eb1ef1..d28160059ba 100644 --- a/tests/integration_tests/owner_remove_table_error/run.sh +++ b/tests/integration_tests/owner_remove_table_error/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/partition_table/run.sh b/tests/integration_tests/partition_table/run.sh index 9d7a5592742..ad0e8b64d31 100644 --- a/tests/integration_tests/partition_table/run.sh +++ b/tests/integration_tests/partition_table/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/processor_err_chan/run.sh b/tests/integration_tests/processor_err_chan/run.sh index ec5025f3d13..848491d3a6a 100644 --- a/tests/integration_tests/processor_err_chan/run.sh +++ b/tests/integration_tests/processor_err_chan/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/processor_panic/run.sh b/tests/integration_tests/processor_panic/run.sh index c1724b41b9f..47ff84ed674 100644 --- a/tests/integration_tests/processor_panic/run.sh +++ b/tests/integration_tests/processor_panic/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/processor_resolved_ts_fallback/run.sh b/tests/integration_tests/processor_resolved_ts_fallback/run.sh index 4c3504911fe..4c11bddaba9 100755 --- a/tests/integration_tests/processor_resolved_ts_fallback/run.sh +++ b/tests/integration_tests/processor_resolved_ts_fallback/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/processor_stop_delay/run.sh b/tests/integration_tests/processor_stop_delay/run.sh index 9240ec9a4e5..57a2c371016 100644 --- a/tests/integration_tests/processor_stop_delay/run.sh +++ b/tests/integration_tests/processor_stop_delay/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/region_merge/run.sh b/tests/integration_tests/region_merge/run.sh index 7d2e57bf0dc..bd80d8260cc 100644 --- a/tests/integration_tests/region_merge/run.sh +++ b/tests/integration_tests/region_merge/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/resolve_lock/run.sh b/tests/integration_tests/resolve_lock/run.sh index 84aa2901d58..9e9cd41e547 100755 --- a/tests/integration_tests/resolve_lock/run.sh +++ b/tests/integration_tests/resolve_lock/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/row_format/run.sh b/tests/integration_tests/row_format/run.sh index 9c7704d52d7..c327b2643a5 100644 --- a/tests/integration_tests/row_format/run.sh +++ b/tests/integration_tests/row_format/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/simple/run.sh b/tests/integration_tests/simple/run.sh index f629477a7d5..bfd2dc8dcd5 100644 --- a/tests/integration_tests/simple/run.sh +++ b/tests/integration_tests/simple/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/sink_hang/run.sh b/tests/integration_tests/sink_hang/run.sh index aa7f675e378..77169bcd6f8 100644 --- a/tests/integration_tests/sink_hang/run.sh +++ b/tests/integration_tests/sink_hang/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/sink_retry/run.sh b/tests/integration_tests/sink_retry/run.sh index 6120f718404..2e123d1d2b2 100755 --- a/tests/integration_tests/sink_retry/run.sh +++ b/tests/integration_tests/sink_retry/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/sorter/run.sh b/tests/integration_tests/sorter/run.sh index a6e4d519b6d..2d550a486f1 100755 --- a/tests/integration_tests/sorter/run.sh +++ b/tests/integration_tests/sorter/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/split_region/run.sh b/tests/integration_tests/split_region/run.sh index 1e241b15d12..6b7b63bc9c8 100755 --- a/tests/integration_tests/split_region/run.sh +++ b/tests/integration_tests/split_region/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/syncpoint/run.sh b/tests/integration_tests/syncpoint/run.sh index 30be944523a..8d56fbdbaf5 100755 --- a/tests/integration_tests/syncpoint/run.sh +++ b/tests/integration_tests/syncpoint/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare diff --git a/tests/integration_tests/tiflash/run.sh b/tests/integration_tests/tiflash/run.sh index 58d6d90c69a..bd263e03ff0 100644 --- a/tests/integration_tests/tiflash/run.sh +++ b/tests/integration_tests/tiflash/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $CUR/../_utils/test_prepare From d44b8740aed1194cc0db4f492764e44ce18ff099 Mon Sep 17 00:00:00 2001 From: lance6716 Date: Thu, 30 Dec 2021 16:03:29 +0800 Subject: [PATCH 2/7] revert some expected `set -e` --- tests/integration_tests/_utils/run_cdc_server | 2 +- tests/integration_tests/_utils/start_tidb_cluster | 2 +- tests/integration_tests/_utils/start_tidb_cluster_impl | 2 +- tests/integration_tests/_utils/start_tls_tidb_cluster | 2 +- tests/integration_tests/_utils/start_tls_tidb_cluster_impl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/integration_tests/_utils/run_cdc_server b/tests/integration_tests/_utils/run_cdc_server index a495c41ed03..dd3396c2fe4 100755 --- a/tests/integration_tests/_utils/run_cdc_server +++ b/tests/integration_tests/_utils/run_cdc_server @@ -8,7 +8,7 @@ # --addr: address # --pd: pd address -set -eu +set -e workdir= tls= diff --git a/tests/integration_tests/_utils/start_tidb_cluster b/tests/integration_tests/_utils/start_tidb_cluster index 48f2de56bd1..c9608b88d4f 100755 --- a/tests/integration_tests/_utils/start_tidb_cluster +++ b/tests/integration_tests/_utils/start_tidb_cluster @@ -4,7 +4,7 @@ # --tidb-config: path to tidb config file # --retry: retry times -set -eu +set -e OUT_DIR= tidb_config= diff --git a/tests/integration_tests/_utils/start_tidb_cluster_impl b/tests/integration_tests/_utils/start_tidb_cluster_impl index c575b18599a..82d36de3a5a 100755 --- a/tests/integration_tests/_utils/start_tidb_cluster_impl +++ b/tests/integration_tests/_utils/start_tidb_cluster_impl @@ -4,7 +4,7 @@ # --tidb-config: path to tidb config file # --multiple-upstream-pd: whether to deploy multiple pd severs in upstream -set -eu +set -e OUT_DIR= tidb_config= diff --git a/tests/integration_tests/_utils/start_tls_tidb_cluster b/tests/integration_tests/_utils/start_tls_tidb_cluster index b8dfd012ef0..5f3e715bbd8 100755 --- a/tests/integration_tests/_utils/start_tls_tidb_cluster +++ b/tests/integration_tests/_utils/start_tls_tidb_cluster @@ -4,7 +4,7 @@ # --tlsdir: certificates directory # --retry: retry times -set -eu +set -e OUT_DIR= TLS_DIR= diff --git a/tests/integration_tests/_utils/start_tls_tidb_cluster_impl b/tests/integration_tests/_utils/start_tls_tidb_cluster_impl index e742babeb61..da31694e5a8 100755 --- a/tests/integration_tests/_utils/start_tls_tidb_cluster_impl +++ b/tests/integration_tests/_utils/start_tls_tidb_cluster_impl @@ -3,7 +3,7 @@ # --workdir: work directory # --tlsdir: certificates directory -set -eu +set -e OUT_DIR= TLS_DIR= From 96d042b1ca6db62752bd7d3ddb53e94ade0dbe53 Mon Sep 17 00:00:00 2001 From: lance6716 Date: Thu, 30 Dec 2021 16:35:16 +0800 Subject: [PATCH 3/7] revert more --- tests/integration_tests/_utils/run_kafka_consumer | 2 +- tests/integration_tests/_utils/run_sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration_tests/_utils/run_kafka_consumer b/tests/integration_tests/_utils/run_kafka_consumer index 4045291bbdd..ead9d0bc685 100755 --- a/tests/integration_tests/_utils/run_kafka_consumer +++ b/tests/integration_tests/_utils/run_kafka_consumer @@ -4,7 +4,7 @@ # parameter 2: sink-uri # parameter 3: log suffix -set -eu +set -e workdir=$1 sink_uri=$2 diff --git a/tests/integration_tests/_utils/run_sql b/tests/integration_tests/_utils/run_sql index 8548e995b1a..0e616f16a0c 100755 --- a/tests/integration_tests/_utils/run_sql +++ b/tests/integration_tests/_utils/run_sql @@ -4,7 +4,7 @@ # parameter 3: database port # parameter 4: other mysql client settings -set -eu +set -e sql=${1} From 4fee668957193a005c760f09e734e68e0af888e1 Mon Sep 17 00:00:00 2001 From: lance6716 Date: Thu, 30 Dec 2021 20:38:33 +0800 Subject: [PATCH 4/7] fix a unbound --- tests/integration_tests/gc_safepoint/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration_tests/gc_safepoint/run.sh b/tests/integration_tests/gc_safepoint/run.sh index b272916ccfb..c72b59dac7b 100755 --- a/tests/integration_tests/gc_safepoint/run.sh +++ b/tests/integration_tests/gc_safepoint/run.sh @@ -93,6 +93,7 @@ function run() { run_kafka_consumer $WORK_DIR "kafka://127.0.0.1:9092/$TOPIC_NAME?protocol=open-protocol&partition-num=4&version=${KAFKA_VERSION}&max-message-bytes=10485760" fi + pd_cluster_id=$(curl -s $pd_addr/pd/api/v1/cluster | grep -oE "id\":\s[0-9]+" | grep -oE "[0-9]+") clear_gc_worker_safepoint $pd_addr $pd_cluster_id run_sql "CREATE DATABASE gc_safepoint;" ${UP_TIDB_HOST} ${UP_TIDB_PORT} @@ -100,7 +101,6 @@ function run() { run_sql "INSERT INTO gc_safepoint.simple VALUES (),();" ${UP_TIDB_HOST} ${UP_TIDB_PORT} check_sync_diff $WORK_DIR $CUR/conf/diff_config.toml - pd_cluster_id=$(curl -s $pd_addr/pd/api/v1/cluster | grep -oE "id\":\s[0-9]+" | grep -oE "[0-9]+") start_safepoint=$(get_safepoint $pd_addr $pd_cluster_id) ensure $MAX_RETRIES check_safepoint_forward $pd_addr $pd_cluster_id $start_safepoint From b9c13d5e7b3afe2b3d4974001d2d6d65d6f829b2 Mon Sep 17 00:00:00 2001 From: lance6716 Date: Fri, 31 Dec 2021 10:14:26 +0800 Subject: [PATCH 5/7] remove a failed test --- dm/tests/others_integration_1.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/dm/tests/others_integration_1.txt b/dm/tests/others_integration_1.txt index 2b538f41477..f5c4992a36b 100644 --- a/dm/tests/others_integration_1.txt +++ b/dm/tests/others_integration_1.txt @@ -2,7 +2,6 @@ full_mode dm_syncer sequence_sharding_optimistic sequence_sharding_removemeta -drop_column_with_index gtid only_dml adjust_gtid From 51da496c57f3aa0d909a74321abc3dec6cc5b564 Mon Sep 17 00:00:00 2001 From: lance6716 Date: Fri, 31 Dec 2021 11:33:48 +0800 Subject: [PATCH 6/7] remove dm_syncer test --- dm/tests/others_integration_1.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/dm/tests/others_integration_1.txt b/dm/tests/others_integration_1.txt index f5c4992a36b..bf792efd449 100644 --- a/dm/tests/others_integration_1.txt +++ b/dm/tests/others_integration_1.txt @@ -1,5 +1,4 @@ full_mode -dm_syncer sequence_sharding_optimistic sequence_sharding_removemeta gtid From f2c509d8ba50404191bba92db347e4b6bac1fb67 Mon Sep 17 00:00:00 2001 From: lance6716 Date: Fri, 31 Dec 2021 13:07:01 +0800 Subject: [PATCH 7/7] remove another failed test --- dm/tests/others_integration_1.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/dm/tests/others_integration_1.txt b/dm/tests/others_integration_1.txt index bf792efd449..b12297daac9 100644 --- a/dm/tests/others_integration_1.txt +++ b/dm/tests/others_integration_1.txt @@ -6,6 +6,5 @@ only_dml adjust_gtid checkpoint_transaction lightning_mode -downstream_diff_index slow_relay_writer sync_collation