From 94ffd72c7e6131a8e670a227073ae8e6483df8f2 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Wed, 29 Apr 2015 12:05:40 -0700 Subject: [PATCH] etcdserver: rename StoreAdminPrefix to StoreClusterPrefix We store cluster related key in StoreAdminPrefix for some historical reason. The previous API is called admin. But now, the admin name is gone and `cluster` is a more clear and correct name. --- etcdserver/server.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/etcdserver/server.go b/etcdserver/server.go index 66ec58e5e..8c7bc54f2 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -58,16 +58,16 @@ const ( // TODO: calculate based on heartbeat interval defaultPublishRetryInterval = 5 * time.Second - StoreAdminPrefix = "/0" - StoreKeysPrefix = "/1" + StoreClusterPrefix = "/0" + StoreKeysPrefix = "/1" purgeFileInterval = 30 * time.Second monitorVersionInterval = 10 * time.Second ) var ( - storeMembersPrefix = path.Join(StoreAdminPrefix, "members") - storeRemovedMembersPrefix = path.Join(StoreAdminPrefix, "removed_members") + storeMembersPrefix = path.Join(StoreClusterPrefix, "members") + storeRemovedMembersPrefix = path.Join(StoreClusterPrefix, "removed_members") storeMemberAttributeRegexp = regexp.MustCompile(path.Join(storeMembersPrefix, "[[:xdigit:]]{1,16}", attributesSuffix)) ) @@ -167,7 +167,7 @@ type EtcdServer struct { // NewServer creates a new EtcdServer from the supplied configuration. The // configuration is considered static for the lifetime of the EtcdServer. func NewServer(cfg *ServerConfig) (*EtcdServer, error) { - st := store.New(StoreAdminPrefix, StoreKeysPrefix) + st := store.New(StoreClusterPrefix, StoreKeysPrefix) var w *wal.WAL var n raft.Node var s *raft.MemoryStorage