scheduler_test: change scheduler check order (#8613)

close #8612 Signed-off-by: husharp <[email protected]> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
tikv · Sep 10, 2024 · 3bd5e3c · 3bd5e3c
1 parent b95ddda
commit 3bd5e3c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/tools/pd-ctl/tests/scheduler/scheduler_test.go b/tools/pd-ctl/tests/scheduler/scheduler_test.go
@@ -320,12 +320,12 @@ func (suite *schedulerTestSuite) checkScheduler(cluster *pdTests.TestCluster) {
 	re.Contains(echo, "Success!")
 	echo = mustExec(re, cmd, []string{"-u", pdAddr, "scheduler", "remove", "evict-leader-scheduler-2"}, nil)
 	re.Contains(echo, "Success!")
-	echo = mustExec(re, cmd, []string{"-u", pdAddr, "scheduler", "remove", "evict-leader-scheduler-1"}, nil)
-	re.Contains(echo, "Unable to update config: scheduler evict-leader-scheduler does not exist.")
 	testutil.Eventually(re, func() bool { // wait for removed scheduler to be synced to scheduling server.
 		echo = mustExec(re, cmd, []string{"-u", pdAddr, "scheduler", "config", "evict-leader-scheduler"}, nil)
 		return strings.Contains(echo, "[404] scheduler not found")
 	})
+	echo = mustExec(re, cmd, []string{"-u", pdAddr, "scheduler", "remove", "evict-leader-scheduler-1"}, nil)
+	re.Contains(echo, "Unable to update config: scheduler evict-leader-scheduler does not exist.")
 
 	// test remove and add
 	echo = mustExec(re, cmd, []string{"-u", pdAddr, "scheduler", "remove", "balance-hot-region-scheduler"}, nil)

diff --git a/tools/pd-simulator/README.md b/tools/pd-simulator/README.md
@@ -34,6 +34,8 @@ Run all cases:
 
 Run a specific case with an internal PD:
 
+You can check case name in `tools/pd-simulator/simulator/cases/cases.go`.
+
 ```shell
 ./pd-simulator -case="casename"
 ```
@@ -53,4 +55,4 @@ tikv conf
 case-name="redundant-balance-region"
 sim-tick-interval="1s"
 store-io-per-second=100
-```
+```
diff --git a/tools/pd-simulator/main.go b/tools/pd-simulator/main.go
@@ -68,7 +68,8 @@ func main() {
 	var err error
 	if *configFile != "" {
 		if meta, err = toml.DecodeFile(*configFile, simConfig); err != nil {
-			simutil.Logger.Fatal("failed to decode file ", zap.Error(err))
+			simutil.Logger.Fatal("failed to decode config file, please check the path of the config file",
+				zap.Error(err), zap.String("config-file", *configFile))
 		}
 	}
 	if err = simConfig.Adjust(&meta); err != nil {