From bdb4d19eabcc40613566b3356b33d6492c863e40 Mon Sep 17 00:00:00 2001 From: okJiang <819421878@qq.com> Date: Thu, 8 Aug 2024 14:48:43 +0800 Subject: [PATCH] fix comment: rename Signed-off-by: okJiang <819421878@qq.com> --- pkg/mcs/scheduling/server/cluster.go | 2 +- pkg/mock/mockconfig/mockconfig.go | 2 +- pkg/schedule/coordinator.go | 4 ++-- pkg/schedule/type/type.go | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/mcs/scheduling/server/cluster.go b/pkg/mcs/scheduling/server/cluster.go index 92b6e5211b5..a5a3a709184 100644 --- 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 index 5d3a86e2993..ccd1f98154d 100644 --- 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 index 6c15ff24d9c..89c99ac90b8 100644 --- 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 index 501076b604d..b7e0b26482e 100644 --- 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,