diff --git a/pkg/mcs/scheduling/server/config/watcher.go b/pkg/mcs/scheduling/server/config/watcher.go index 1c87076429e..c4f1d475a44 100644 --- a/pkg/mcs/scheduling/server/config/watcher.go +++ b/pkg/mcs/scheduling/server/config/watcher.go @@ -186,10 +186,9 @@ func (cw *Watcher) initializeTTLConfigWatcher() error { } func (cw *Watcher) initializeSchedulerConfigWatcher() error { - prefixToTrim := cw.schedulerConfigPathPrefix + "/" putFn := func(kv *mvccpb.KeyValue) error { key := string(kv.Key) - name := strings.TrimPrefix(key, prefixToTrim) + name := strings.TrimPrefix(key, cw.schedulerConfigPathPrefix) log.Info("update scheduler config", zap.String("name", name), zap.String("value", string(kv.Value))) err := cw.storage.SaveSchedulerConfig(name, kv.Value) @@ -210,7 +209,7 @@ func (cw *Watcher) initializeSchedulerConfigWatcher() error { key := string(kv.Key) log.Info("remove scheduler config", zap.String("key", key)) return cw.storage.RemoveSchedulerConfig( - strings.TrimPrefix(key, prefixToTrim), + strings.TrimPrefix(key, cw.schedulerConfigPathPrefix), ) } cw.schedulerConfigWatcher = etcdutil.NewLoopWatcher( diff --git a/pkg/mcs/scheduling/server/rule/watcher.go b/pkg/mcs/scheduling/server/rule/watcher.go index f20c4fa7f99..3966975e053 100644 --- a/pkg/mcs/scheduling/server/rule/watcher.go +++ b/pkg/mcs/scheduling/server/rule/watcher.go @@ -211,7 +211,6 @@ func (rw *Watcher) initializeRuleWatcher() error { } func (rw *Watcher) initializeRegionLabelWatcher() error { - prefixToTrim := rw.regionLabelPathPrefix + "/" // TODO: use txn in region labeler. preEventsFn := func([]*clientv3.Event) error { // It will be locked until the postEventsFn is finished. @@ -229,7 +228,7 @@ func (rw *Watcher) initializeRegionLabelWatcher() error { deleteFn := func(kv *mvccpb.KeyValue) error { key := string(kv.Key) log.Info("delete region label rule", zap.String("key", key)) - return rw.regionLabeler.DeleteLabelRuleLocked(strings.TrimPrefix(key, prefixToTrim)) + return rw.regionLabeler.DeleteLabelRuleLocked(strings.TrimPrefix(key, rw.regionLabelPathPrefix)) } postEventsFn := func([]*clientv3.Event) error { defer rw.regionLabeler.Unlock()