lightning: fix pd leader switch CI after PD upgrading (#55498)

close #55487
pingcap · Aug 20, 2024 · 8f75ed3 · 8f75ed3
1 parent f471302
commit 8f75ed3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/br/tests/config/pd.toml b/br/tests/config/pd.toml
@@ -1,6 +1,3 @@
-lease = 360
-tso-save-interval = "360s"
-
 [replication]
 enable-placement-rules = true
 

diff --git a/lightning/tests/config/pd.toml b/lightning/tests/config/pd.toml
@@ -1,6 +1,3 @@
-lease = 360
-tso-save-interval = "360s"
-
 [replication]
 enable-placement-rules = true
 

diff --git a/lightning/tests/lightning_pd_leader_switch/run.sh b/lightning/tests/lightning_pd_leader_switch/run.sh
@@ -20,6 +20,7 @@ set -eu
 cur=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 . $UTILS_DIR/run_services
 
+echo "will start pd2"
 pd-server --join "https://$PD_ADDR" \
   --client-urls "https://${PD_ADDR}2" \
   --peer-urls "https://${PD_PEER_ADDR}2" \
@@ -29,8 +30,9 @@ pd-server --join "https://$PD_ADDR" \
   --config $PD_CONFIG &
 
 # strange that new PD can't join too quickly
-sleep 10
+sleep 20
 
+echo "will start pd3"
 pd-server --join "https://$PD_ADDR" \
   --client-urls "https://${PD_ADDR}3" \
   --peer-urls "https://${PD_PEER_ADDR}3" \

diff --git a/lightning/tests/run_group_lightning_tests.sh b/lightning/tests/run_group_lightning_tests.sh
@@ -42,7 +42,7 @@ groups=(
 	["G05"]='lightning_fail_fast lightning_fail_fast_on_nonretry_err lightning_file_routing lightning_foreign_key lightning_gcs lightning_generated_columns lightning_ignore_columns lightning_import_compress lightning_incremental lightning_issue_282 lightning_issue_40657 lightning_issue_410 lightning_issue_519 lightning_local_backend lightning_max_incr'
 	["G06"]='lightning_max_random lightning_multi_valued_index lightning_new_collation lightning_no_schema lightning_parquet lightning_partition_incremental lightning_partitioned-table lightning_record_network lightning_reload_cert lightning_restore lightning_routes lightning_routes_panic lightning_row-format-v2 lightning_s3'
 	["G07"]='lightning_shard_rowid lightning_source_linkfile lightning_sqlmode lightning_tidb_duplicate_data lightning_tidb_rowid lightning_tiflash lightning_tikv_multi_rocksdb lightning_too_many_columns lightning_tool_135'
-	["G08"]='lightning_tool_1420 lightning_tool_1472 lightning_tool_241 lightning_ttl lightning_unused_config_keys lightning_various_types lightning_view lightning_write_batch lightning_write_limit lightning_pd_leader_switch lightning_add_index lightning_alter_random lightning_auto_columns'
+	["G08"]='lightning_pd_leader_switch lightning_tool_1420 lightning_tool_1472 lightning_tool_241 lightning_ttl lightning_unused_config_keys lightning_various_types lightning_view lightning_write_batch lightning_write_limit lightning_add_index lightning_alter_random lightning_auto_columns'
 )
 
 # Get other lightning cases not in groups, to avoid missing any case