From 6cd3633543e28c5dce22db5302a2429e8b303115 Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Mon, 5 Jul 2021 16:50:06 +0200 Subject: [PATCH] etcdserver: Rename membershipStore to membershipBackend --- etcdutl/etcdutl/backup_command.go | 2 +- etcdutl/snapshot/v3_snapshot.go | 4 ++-- server/etcdserver/bootstrap.go | 6 +++--- server/etcdserver/server.go | 2 +- server/storage/schema/membership.go | 28 ++++++++++++++-------------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/etcdutl/etcdutl/backup_command.go b/etcdutl/etcdutl/backup_command.go index 1f249ca5a..bf8ede334 100644 --- a/etcdutl/etcdutl/backup_command.go +++ b/etcdutl/etcdutl/backup_command.go @@ -311,7 +311,7 @@ func saveDB(lg *zap.Logger, destDB, srcDB string, idx uint64, term uint64, desir be := backend.NewDefaultBackend(destDB) defer be.Close() - ms := schema.NewMembershipStore(lg, be) + ms := schema.NewMembershipBackend(lg, be) if err := ms.TrimClusterFromBackend(); err != nil { lg.Fatal("bbolt tx.Membership failed", zap.Error(err)) } diff --git a/etcdutl/snapshot/v3_snapshot.go b/etcdutl/snapshot/v3_snapshot.go index eefcdb812..36fc9ee8c 100644 --- a/etcdutl/snapshot/v3_snapshot.go +++ b/etcdutl/snapshot/v3_snapshot.go @@ -306,7 +306,7 @@ func (s *v3Manager) saveDB() error { be := backend.NewDefaultBackend(s.outDbPath()) defer be.Close() - err = schema.NewMembershipStore(s.lg, be).TrimMembershipFromBackend() + err = schema.NewMembershipBackend(s.lg, be).TrimMembershipFromBackend() if err != nil { return err } @@ -403,7 +403,7 @@ func (s *v3Manager) saveWALAndSnap() (*raftpb.HardState, error) { s.cl.SetStore(st) be := backend.NewDefaultBackend(s.outDbPath()) defer be.Close() - s.cl.SetBackend(schema.NewMembershipStore(s.lg, be)) + s.cl.SetBackend(schema.NewMembershipBackend(s.lg, be)) for _, m := range s.cl.Members() { s.cl.AddMember(m, true) } diff --git a/server/etcdserver/bootstrap.go b/server/etcdserver/bootstrap.go index d0f95f4c4..497d06ac1 100644 --- a/server/etcdserver/bootstrap.go +++ b/server/etcdserver/bootstrap.go @@ -200,7 +200,7 @@ func bootstrapExistingClusterNoWAL(cfg config.ServerConfig, prt http.RoundTrippe remotes := existingCluster.Members() cl.SetID(types.ID(0), existingCluster.ID()) cl.SetStore(st) - cl.SetBackend(schema.NewMembershipStore(cfg.Logger, be)) + cl.SetBackend(schema.NewMembershipBackend(cfg.Logger, be)) br := bootstrapRaftFromCluster(cfg, cl, nil) cl.SetID(br.wal.id, existingCluster.ID()) return &bootstrappedServer{ @@ -240,7 +240,7 @@ func bootstrapNewClusterNoWAL(cfg config.ServerConfig, prt http.RoundTripper, st } } cl.SetStore(st) - cl.SetBackend(schema.NewMembershipStore(cfg.Logger, be)) + cl.SetBackend(schema.NewMembershipBackend(cfg.Logger, be)) br := bootstrapRaftFromCluster(cfg, cl, cl.MemberIDs()) cl.SetID(br.wal.id, cl.ID()) return &bootstrappedServer{ @@ -330,7 +330,7 @@ func bootstrapWithWAL(cfg config.ServerConfig, st v2store.Store, be backend.Back } r.raft.cl.SetStore(st) - r.raft.cl.SetBackend(schema.NewMembershipStore(cfg.Logger, be)) + r.raft.cl.SetBackend(schema.NewMembershipBackend(cfg.Logger, be)) r.raft.cl.Recover(api.UpdateCapability) if r.raft.cl.Version() != nil && !r.raft.cl.Version().LessThan(semver.Version{Major: 3}) && !beExist { bepath := cfg.BackendPath() diff --git a/server/etcdserver/server.go b/server/etcdserver/server.go index 1f7d7dc09..cec7ad334 100644 --- a/server/etcdserver/server.go +++ b/server/etcdserver/server.go @@ -1075,7 +1075,7 @@ func (s *EtcdServer) applySnapshot(ep *etcdProgress, apply *apply) { lg.Info("restored v2 store") - s.cluster.SetBackend(schema.NewMembershipStore(lg, newbe)) + s.cluster.SetBackend(schema.NewMembershipBackend(lg, newbe)) lg.Info("restoring cluster configuration") diff --git a/server/storage/schema/membership.go b/server/storage/schema/membership.go index b188ef7d9..6328413b7 100644 --- a/server/storage/schema/membership.go +++ b/server/storage/schema/membership.go @@ -31,19 +31,19 @@ const ( MemberRaftAttributesSuffix = "raftAttributes" ) -type membershipStore struct { +type membershipBackend struct { lg *zap.Logger be backend.Backend } -func NewMembershipStore(lg *zap.Logger, be backend.Backend) *membershipStore { - return &membershipStore{ +func NewMembershipBackend(lg *zap.Logger, be backend.Backend) *membershipBackend { + return &membershipBackend{ lg: lg, be: be, } } -func (s *membershipStore) MustSaveMemberToBackend(m *membership.Member) { +func (s *membershipBackend) MustSaveMemberToBackend(m *membership.Member) { mkey := BackendMemberKey(m.ID) mvalue, err := json.Marshal(m) if err != nil { @@ -58,7 +58,7 @@ func (s *membershipStore) MustSaveMemberToBackend(m *membership.Member) { // TrimClusterFromBackend removes all information about cluster (versions) // from the v3 backend. -func (s *membershipStore) TrimClusterFromBackend() error { +func (s *membershipBackend) TrimClusterFromBackend() error { tx := s.be.BatchTx() tx.Lock() defer tx.Unlock() @@ -66,7 +66,7 @@ func (s *membershipStore) TrimClusterFromBackend() error { return nil } -func (s *membershipStore) MustDeleteMemberFromBackend(id types.ID) { +func (s *membershipBackend) MustDeleteMemberFromBackend(id types.ID) { mkey := BackendMemberKey(id) tx := s.be.BatchTx() @@ -76,7 +76,7 @@ func (s *membershipStore) MustDeleteMemberFromBackend(id types.ID) { tx.UnsafePut(MembersRemoved, mkey, []byte("removed")) } -func (s *membershipStore) MustReadMembersFromBackend() (map[types.ID]*membership.Member, map[types.ID]bool) { +func (s *membershipBackend) MustReadMembersFromBackend() (map[types.ID]*membership.Member, map[types.ID]bool) { members, removed, err := s.readMembersFromBackend() if err != nil { s.lg.Panic("couldn't read members from backend", zap.Error(err)) @@ -84,7 +84,7 @@ func (s *membershipStore) MustReadMembersFromBackend() (map[types.ID]*membership return members, removed } -func (s *membershipStore) readMembersFromBackend() (map[types.ID]*membership.Member, map[types.ID]bool, error) { +func (s *membershipBackend) readMembersFromBackend() (map[types.ID]*membership.Member, map[types.ID]bool, error) { members := make(map[types.ID]*membership.Member) removed := make(map[types.ID]bool) @@ -117,7 +117,7 @@ func (s *membershipStore) readMembersFromBackend() (map[types.ID]*membership.Mem // TrimMembershipFromBackend removes all information about members & // removed_members from the v3 backend. -func (s *membershipStore) TrimMembershipFromBackend() error { +func (s *membershipBackend) TrimMembershipFromBackend() error { s.lg.Info("Trimming membership information from the backend...") tx := s.be.BatchTx() tx.Lock() @@ -141,7 +141,7 @@ func (s *membershipStore) TrimMembershipFromBackend() error { // MustSaveClusterVersionToBackend saves cluster version to backend. // The field is populated since etcd v3.5. -func (s *membershipStore) MustSaveClusterVersionToBackend(ver *semver.Version) { +func (s *membershipBackend) MustSaveClusterVersionToBackend(ver *semver.Version) { ckey := ClusterClusterVersionKeyName tx := s.be.BatchTx() @@ -152,7 +152,7 @@ func (s *membershipStore) MustSaveClusterVersionToBackend(ver *semver.Version) { // MustSaveDowngradeToBackend saves downgrade info to backend. // The field is populated since etcd v3.5. -func (s *membershipStore) MustSaveDowngradeToBackend(downgrade *membership.DowngradeInfo) { +func (s *membershipBackend) MustSaveDowngradeToBackend(downgrade *membership.DowngradeInfo) { dkey := ClusterDowngradeKeyName dvalue, err := json.Marshal(downgrade) if err != nil { @@ -164,7 +164,7 @@ func (s *membershipStore) MustSaveDowngradeToBackend(downgrade *membership.Downg tx.UnsafePut(Cluster, dkey, dvalue) } -func (s *membershipStore) MustCreateBackendBuckets() { +func (s *membershipBackend) MustCreateBackendBuckets() { tx := s.be.BatchTx() tx.Lock() defer tx.Unlock() @@ -183,7 +183,7 @@ func mustParseMemberIDFromBytes(lg *zap.Logger, key []byte) types.ID { // ClusterVersionFromBackend reads cluster version from backend. // The field is populated since etcd v3.5. -func (s *membershipStore) ClusterVersionFromBackend() *semver.Version { +func (s *membershipBackend) ClusterVersionFromBackend() *semver.Version { ckey := ClusterClusterVersionKeyName tx := s.be.ReadTx() tx.RLock() @@ -203,7 +203,7 @@ func (s *membershipStore) ClusterVersionFromBackend() *semver.Version { // DowngradeInfoFromBackend reads downgrade info from backend. // The field is populated since etcd v3.5. -func (s *membershipStore) DowngradeInfoFromBackend() *membership.DowngradeInfo { +func (s *membershipBackend) DowngradeInfoFromBackend() *membership.DowngradeInfo { dkey := ClusterDowngradeKeyName tx := s.be.ReadTx() tx.Lock()