keypath: remove rootPath from storage and change all paths to absolute path (tikv#8919)

close tikv#8582

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
Signed-off-by: okJiang <[email protected]>

Author: okJiang

client/servicediscovery/tso_service_discovery.go

@@ -41,12 +41,10 @@ import (
 )
 
 const (
-	msServiceRootPath = "/ms"
-	tsoServiceName    = "tso"
 	// tsoSvcDiscoveryFormat defines the key prefix for keyspace group primary election.
 	// The entire key is in the format of "/ms/<cluster-id>/tso/<group-id>/primary".
 	// The <group-id> is 5 digits integer with leading zeros.
-	tsoSvcDiscoveryFormat = msServiceRootPath + "/%d/" + tsoServiceName + "/%05d/primary"
+	tsoSvcDiscoveryFormat = "/ms/%d/tso/%05d/primary"
 	// initRetryInterval is the rpc retry interval during the initialization phase.
 	initRetryInterval = time.Second
 	// tsoQueryRetryMaxTimes is the max retry times for querying TSO.

pkg/keyspace/tso_keyspace_group.go

@@ -219,7 +219,7 @@ func (m *GroupManager) allocNodesToAllKeyspaceGroups(ctx context.Context) {
 }
 
 func (m *GroupManager) initTSONodesWatcher(client *clientv3.Client) {
-	tsoServiceKey := keypath.TSOPath()
+	tsoServiceKey := keypath.ServicePath(constant.TSOServiceName)
 
 	putFn := func(kv *mvccpb.KeyValue) error {
 		s := &discovery.ServiceRegistryEntry{}

pkg/mcs/metastorage/server/manager.go

@@ -21,15 +21,12 @@ import (
 	"github.com/pingcap/log"
 
 	bs "github.com/tikv/pd/pkg/basicserver"
-	"github.com/tikv/pd/pkg/storage/endpoint"
-	"github.com/tikv/pd/pkg/storage/kv"
 )
 
-// Manager is the manager of resource group.
+// Manager is the manager of meta storage.
 type Manager struct {
-	srv     bs.Server
-	client  *clientv3.Client
-	storage *endpoint.StorageEndpoint
+	srv    bs.Server
+	client *clientv3.Client
 }
 
 // NewManager returns a new Manager.
@@ -38,10 +35,6 @@ func NewManager(srv bs.Server) *Manager {
 	// The first initialization after the server is started.
 	srv.AddStartCallback(func() {
 		log.Info("meta storage starts to initialize", zap.String("name", srv.Name()))
-		m.storage = endpoint.NewStorageEndpoint(
-			kv.NewEtcdKVBase(srv.GetClient(), "meta_storage"),
-			nil,
-		)
 		m.client = srv.GetClient()
 		m.srv = srv
 	})

pkg/mcs/resourcemanager/server/manager.go

@@ -102,7 +102,7 @@ func NewManager[T ConfigProvider](srv bs.Server) *Manager {
 	srv.AddStartCallback(func() {
 		log.Info("resource group manager starts to initialize", zap.String("name", srv.Name()))
 		m.storage = endpoint.NewStorageEndpoint(
-			kv.NewEtcdKVBase(srv.GetClient(), "resource_group"),
+			kv.NewEtcdKVBase(srv.GetClient()),
 			nil,
 		)
 		m.srv = srv

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(

pkg/mcs/scheduling/server/rule/watcher.go

@@ -159,7 +159,7 @@ func (rw *Watcher) initializeRuleWatcher() error {
 		key := string(kv.Key)
 		if strings.HasPrefix(key, rw.rulesPathPrefix) {
 			log.Info("delete placement rule", zap.String("key", key))
-			ruleJSON, err := rw.ruleStorage.LoadRule(strings.TrimPrefix(key, rw.rulesPathPrefix+"/"))
+			ruleJSON, err := rw.ruleStorage.LoadRule(strings.TrimPrefix(key, rw.rulesPathPrefix))
 			if err != nil {
 				return err
 			}
@@ -174,7 +174,7 @@ func (rw *Watcher) initializeRuleWatcher() error {
 			return err
 		} else if strings.HasPrefix(key, rw.ruleGroupPathPrefix) {
 			log.Info("delete placement rule group", zap.String("key", key))
-			trimmedKey := strings.TrimPrefix(key, rw.ruleGroupPathPrefix+"/")
+			trimmedKey := strings.TrimPrefix(key, rw.ruleGroupPathPrefix)
 			// Try to add the rule group change to the patch.
 			rw.patch.DeleteGroup(trimmedKey)
 			// Update the suspect key ranges
@@ -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()

pkg/mcs/scheduling/server/rule/watcher_test.go

@@ -102,7 +102,7 @@ func prepare(t require.TestingT) (context.Context, *clientv3.Client, func()) {
 		}
 		value, err := json.Marshal(rule)
 		re.NoError(err)
-		key := keypath.RegionLabelPathPrefix() + "/" + rule.ID
+		key := keypath.RegionLabelKeyPath(rule.ID)
 		_, err = clientv3.NewKV(client).Put(ctx, key, string(value))
 		re.NoError(err)
 	}

pkg/mcs/tso/server/server.go

@@ -346,11 +346,9 @@ func (s *Server) startServer() (err error) {
 
 	// Initialize the TSO service.
 	s.serverLoopCtx, s.serverLoopCancel = context.WithCancel(s.Context())
-	legacySvcRootPath := keypath.LegacyRootPath()
-	tsoSvcRootPath := keypath.TSOSvcRootPath()
 	s.keyspaceGroupManager = tso.NewKeyspaceGroupManager(
 		s.serverLoopCtx, s.serviceID, s.GetClient(), s.GetHTTPClient(),
-		s.cfg.AdvertiseListenAddr, legacySvcRootPath, tsoSvcRootPath, s.cfg)
+		s.cfg.AdvertiseListenAddr, s.cfg)
 	if err := s.keyspaceGroupManager.Initialize(); err != nil {
 		return err
 	}

pkg/schedule/labeler/labeler_test.go

@@ -149,7 +149,7 @@ func TestTxnWithEtcd(t *testing.T) {
 	re := require.New(t)
 	_, client, clean := etcdutil.NewTestEtcdCluster(t, 1)
 	defer clean()
-	store := storage.NewStorageWithEtcdBackend(client, "")
+	store := storage.NewStorageWithEtcdBackend(client)
 	labeler, err := NewRegionLabeler(context.Background(), store, time.Millisecond*10)
 	re.NoError(err)
 	// test patch rules in batch

pkg/storage/endpoint/config.go

@@ -40,7 +40,7 @@ var _ ConfigStorage = (*StorageEndpoint)(nil)
 
 // LoadConfig loads config from keypath.Config then unmarshal it to cfg.
 func (se *StorageEndpoint) LoadConfig(cfg any) (bool, error) {
-	value, err := se.Load(keypath.Config)
+	value, err := se.Load(keypath.ConfigPath())
 	if err != nil || value == "" {
 		return false, err
 	}
@@ -53,12 +53,12 @@ func (se *StorageEndpoint) LoadConfig(cfg any) (bool, error) {
 
 // SaveConfig stores marshallable cfg to the keypath.Config.
 func (se *StorageEndpoint) SaveConfig(cfg any) error {
-	return se.saveJSON(keypath.Config, cfg)
+	return se.saveJSON(keypath.ConfigPath(), cfg)
 }
 
 // LoadAllSchedulerConfigs loads all schedulers' config.
 func (se *StorageEndpoint) LoadAllSchedulerConfigs() (keys, values []string, err error) {
-	prefix := keypath.CustomSchedulerConfigPath + "/"
+	prefix := keypath.SchedulerConfigPathPrefix()
 	keys, values, err = se.LoadRange(prefix, clientv3.GetPrefixRangeEnd(prefix), MinKVRangeLimit)
 	for i, key := range keys {
 		keys[i] = strings.TrimPrefix(key, prefix)