Merge branch 'master' into pkg-entry-testify

pingcap · Sep 16, 2021 · b0feb7f · b0feb7f
2 parents 6ac15bd + f368d93
commit b0feb7f
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/tests/_utils/stop_tidb_cluster b/tests/_utils/stop_tidb_cluster
@@ -1,13 +1,15 @@
 #!/bin/bash
 
-killall -q -w -s 9 tikv-server || true
-killall -q -w -s 9 pd-server || true
-killall -q -w -s 9 tidb-server || true
-killall -q -w -s 9 cdc || true
+# cdc server is ran by binary cdc.test, kill cdc server first to avoid too much
+# noise in cdc logs.
 killall -q -w -s 9 cdc.test || true
+killall -q -w -s 9 cdc || true
+killall -q -w -s 9 cdc_state_checker || true
+killall -q -w -s 9 tidb-server || true
+killall -q -w -s 9 tikv-server || true
 killall -q -w -s 9 tiflash || true
 killall -q -w -s 9 flash_cluster_manager || true
-killall -q -w -s 9 cdc_state_checker || true
+killall -q -w -s 9 pd-server || true
 
 CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 source $CUR/../_utils/test_prepare