vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2774 from xiang90/cluster 

etcdserver: rename StoreAdminPrefix to StoreClusterPrefix
release-2.1
Xiang Li 2015-04-29 12:20:04 -07:00
parent a4e35f4650 94ffd72c7e
commit 0fbf90b1e0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etcdserver/server.go
View File

@ -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