fix comment: rename

Signed-off-by: okJiang <[email protected]>
tikv · Aug 8, 2024 · bdb4d19 · bdb4d19
1 parent 25f5f1a
commit bdb4d19
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/pkg/mcs/scheduling/server/cluster.go b/pkg/mcs/scheduling/server/cluster.go
@@ -309,7 +309,7 @@ func (c *Cluster) updateScheduler() {
 		)
 		// Create the newly added schedulers.
 		for _, scheduler := range latestSchedulersConfig {
-			schedulerType := types.ConvertOldStr2Type[scheduler.Type]
+			schedulerType := types.ConvertOldStrToType[scheduler.Type]
 			s, err := schedulers.CreateScheduler(
 				schedulerType,
 				c.coordinator.GetOperatorController(),

diff --git a/pkg/mock/mockconfig/mockconfig.go b/pkg/mock/mockconfig/mockconfig.go
@@ -24,7 +24,7 @@ import (
 func NewTestOptions() *config.PersistOptions {
 	// register default schedulers in case config check fail.
 	for _, d := range sc.DefaultSchedulers {
-		sc.RegisterScheduler(types.ConvertOldStr2Type[d.Type])
+		sc.RegisterScheduler(types.ConvertOldStrToType[d.Type])
 	}
 	c := config.NewConfig()
 	c.Adjust(nil, false)

diff --git a/pkg/schedule/coordinator.go b/pkg/schedule/coordinator.go
@@ -289,7 +289,7 @@ func (c *Coordinator) InitSchedulers(needRun bool) {
 			log.Info("skip create scheduler with independent configuration", zap.String("scheduler-name", name), zap.String("scheduler-type", cfg.Type), zap.Strings("scheduler-args", cfg.Args))
 			continue
 		}
-		s, err := schedulers.CreateScheduler(types.ConvertOldStr2Type[cfg.Type], c.opController,
+		s, err := schedulers.CreateScheduler(types.ConvertOldStrToType[cfg.Type], c.opController,
 			c.cluster.GetStorage(), schedulers.ConfigJSONDecoder([]byte(data)), c.schedulers.RemoveScheduler)
 		if err != nil {
 			log.Error("can not create scheduler with independent configuration", zap.String("scheduler-name", name), zap.Strings("scheduler-args", cfg.Args), errs.ZapError(err))
@@ -320,7 +320,7 @@ func (c *Coordinator) InitSchedulers(needRun bool) {
 			continue
 		}
 
-		tp := types.ConvertOldStr2Type[schedulerCfg.Type]
+		tp := types.ConvertOldStrToType[schedulerCfg.Type]
 		s, err := schedulers.CreateScheduler(tp, c.opController,
 			c.cluster.GetStorage(), schedulers.ConfigSliceDecoder(tp, schedulerCfg.Args), c.schedulers.RemoveScheduler)
 		if err != nil {

diff --git a/pkg/schedule/type/type.go b/pkg/schedule/type/type.go
@@ -73,7 +73,7 @@ const (
 	LabelScheduler CheckerSchedulerType = "label-scheduler"
 )
 
-// TODO: SchedulerTypeCompatibleMap and ConvertOldStr2Type should be removed after
+// TODO: SchedulerTypeCompatibleMap and ConvertOldStrToType should be removed after
 // fixing this issue(https://github.com/tikv/pd/issues/8474).
 var (
 	// SchedulerTypeCompatibleMap exists for compatibility.
@@ -100,10 +100,10 @@ var (
 		LabelScheduler:                 "label",
 	}
 
-	// ConvertOldStr2Type exists for compatibility.
+	// ConvertOldStrToType exists for compatibility.
 	//
 	//	It is used to convert the old scheduler type to `CheckerSchedulerType`.
-	ConvertOldStr2Type = map[string]CheckerSchedulerType{
+	ConvertOldStrToType = map[string]CheckerSchedulerType{
 		"balance-leader":          BalanceLeaderScheduler,
 		"balance-region":          BalanceRegionScheduler,
 		"balance-witness":         BalanceWitnessScheduler,