This is an automated cherry-pick of tikv#7765

close tikv#4399 Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot · Dec 11, 2024 · 2c0d131 · 2c0d131
1 parent de32e69
commit 2c0d131
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 1 deletion.
diff --git a/pkg/schedule/config/config.go b/pkg/schedule/config/config.go
@@ -525,9 +525,12 @@ type SchedulerConfig struct {
 var DefaultSchedulers = SchedulerConfigs{
 	{Type: "balance-region"},
 	{Type: "balance-leader"},
-	{Type: "balance-witness"},
 	{Type: "hot-region"},
+<<<<<<< HEAD
 	{Type: "transfer-witness-leader"},
+=======
+	{Type: "evict-slow-store"},
+>>>>>>> 5b939c6fc (config: disable witness related schedulers by default (#7765))
 }
 
 // IsDefaultScheduler checks whether the scheduler is enable by default.

diff --git a/server/cluster/cluster_test.go b/server/cluster/cluster_test.go
@@ -3041,8 +3041,12 @@ func TestAddScheduler(t *testing.T) {
 	re.NoError(controller.RemoveScheduler(schedulers.BalanceLeaderName))
 	re.NoError(controller.RemoveScheduler(schedulers.BalanceRegionName))
 	re.NoError(controller.RemoveScheduler(schedulers.HotRegionName))
+<<<<<<< HEAD
 	re.NoError(controller.RemoveScheduler(schedulers.BalanceWitnessName))
 	re.NoError(controller.RemoveScheduler(schedulers.TransferWitnessLeaderName))
+=======
+	re.NoError(controller.RemoveScheduler(schedulers.EvictSlowStoreName))
+>>>>>>> 5b939c6fc (config: disable witness related schedulers by default (#7765))
 	re.Empty(controller.GetSchedulerNames())
 
 	stream := mockhbstream.NewHeartbeatStream()
@@ -3137,9 +3141,15 @@ func TestPersistScheduler(t *testing.T) {
 	re.NoError(controller.RemoveScheduler(schedulers.BalanceLeaderName))
 	re.NoError(controller.RemoveScheduler(schedulers.BalanceRegionName))
 	re.NoError(controller.RemoveScheduler(schedulers.HotRegionName))
+<<<<<<< HEAD
 	re.NoError(controller.RemoveScheduler(schedulers.BalanceWitnessName))
 	re.NoError(controller.RemoveScheduler(schedulers.TransferWitnessLeaderName))
 	re.Len(controller.GetSchedulerNames(), defaultCount-3)
+=======
+	re.NoError(controller.RemoveScheduler(schedulers.EvictSlowStoreName))
+	// only remains 2 items with independent config.
+	re.Len(controller.GetSchedulerNames(), 2)
+>>>>>>> 5b939c6fc (config: disable witness related schedulers by default (#7765))
 	re.NoError(co.GetCluster().GetSchedulerConfig().Persist(storage))
 	co.Stop()
 	co.GetSchedulersController().Wait()
@@ -3249,8 +3259,12 @@ func TestRemoveScheduler(t *testing.T) {
 	re.NoError(controller.RemoveScheduler(schedulers.BalanceRegionName))
 	re.NoError(controller.RemoveScheduler(schedulers.HotRegionName))
 	re.NoError(controller.RemoveScheduler(schedulers.GrantLeaderName))
+<<<<<<< HEAD
 	re.NoError(controller.RemoveScheduler(schedulers.BalanceWitnessName))
 	re.NoError(controller.RemoveScheduler(schedulers.TransferWitnessLeaderName))
+=======
+	re.NoError(controller.RemoveScheduler(schedulers.EvictSlowStoreName))
+>>>>>>> 5b939c6fc (config: disable witness related schedulers by default (#7765))
 	// all removed
 	sches, _, err = storage.LoadAllSchedulerConfigs()
 	re.NoError(err)

diff --git a/tests/integrations/mcs/scheduling/server_test.go b/tests/integrations/mcs/scheduling/server_test.go
@@ -265,6 +265,7 @@ func (suite *serverTestSuite) TestSchedulerSync() {
 	api.MustDeleteScheduler(re, suite.backendEndpoints, schedulers.EvictLeaderName)
 	checkEvictLeaderSchedulerExist(re, schedulersController, false)
 
+<<<<<<< HEAD
 	// TODO: test more schedulers.
 	// Fixme: the following code will fail because the scheduler is not removed but not synced.
 	// checkDelete := func(schedulerName string) {
@@ -277,6 +278,32 @@ func (suite *serverTestSuite) TestSchedulerSync() {
 	// checkDelete(schedulers.BalanceLeaderName)
 	// checkDelete(schedulers.BalanceRegionName)
 	// checkDelete(schedulers.HotRegionName)
+=======
+	// The default scheduler could not be deleted, it could only be disabled.
+	defaultSchedulerNames := []string{
+		schedulers.BalanceLeaderName,
+		schedulers.BalanceRegionName,
+		schedulers.HotRegionName,
+	}
+	checkDisabled := func(name string, shouldDisabled bool) {
+		re.NotNil(schedulersController.GetScheduler(name), name)
+		testutil.Eventually(re, func() bool {
+			disabled, err := schedulersController.IsSchedulerDisabled(name)
+			re.NoError(err, name)
+			return disabled == shouldDisabled
+		})
+	}
+	for _, name := range defaultSchedulerNames {
+		checkDisabled(name, false)
+		api.MustDeleteScheduler(re, suite.backendEndpoints, name)
+		checkDisabled(name, true)
+	}
+	for _, name := range defaultSchedulerNames {
+		checkDisabled(name, true)
+		api.MustAddScheduler(re, suite.backendEndpoints, name, nil)
+		checkDisabled(name, false)
+	}
+>>>>>>> 5b939c6fc (config: disable witness related schedulers by default (#7765))
 }
 
 func checkEvictLeaderSchedulerExist(re *require.Assertions, sc *schedulers.Controller, exist bool) {