Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdserver: Move all named keys to buckets module

Browse Source
This commit is contained in:
Marek Siarkowicz
2021-06-28 15:42:00 +02:00
parent 2a0f8f0738
commit f79d09d48b
8 changed files with 43 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/etcdserver/api/membership/cluster.go
View File

@@ -697,7 +697,7 @@ func clusterVersionFromStore(lg *zap.Logger, st v2store.Store) *semver.Version {
// The field is populated since etcd v3.5.
func clusterVersionFromBackend(lg *zap.Logger, be backend.Backend) *semver.Version {
ckey := backendClusterVersionKey()
ckey := buckets.ClusterClusterVersionKeyName
tx := be.ReadTx()
tx.RLock()
defer tx.RUnlock()
@@ -716,7 +716,7 @@ func clusterVersionFromBackend(lg *zap.Logger, be backend.Backend) *semver.Versi
// The field is populated since etcd v3.5.
func downgradeInfoFromBackend(lg *zap.Logger, be backend.Backend) *DowngradeInfo {
dkey := backendDowngradeKey()
dkey := buckets.ClusterDowngradeKeyName
tx := be.ReadTx()
tx.Lock()
defer tx.Unlock()

20
server/etcdserver/api/membership/store.go
View File

@@ -42,7 +42,7 @@ var (
)
func mustSaveMemberToBackend(lg *zap.Logger, be backend.Backend, m *Member) {
mkey := backendMemberKey(m.ID)
mkey := buckets.BackendMemberKey(m.ID)
mvalue, err := json.Marshal(m)
if err != nil {
lg.Panic("failed to marshal member", zap.Error(err))
@@ -65,7 +65,7 @@ func TrimClusterFromBackend(be backend.Backend) error {
}
func mustDeleteMemberFromBackend(be backend.Backend, id types.ID) {
mkey := backendMemberKey(id)
mkey := buckets.BackendMemberKey(id)
tx := be.BatchTx()
tx.Lock()
@@ -160,7 +160,7 @@ func TrimMembershipFromV2Store(lg *zap.Logger, s v2store.Store) error {
// The field is populated since etcd v3.5.
func mustSaveClusterVersionToBackend(be backend.Backend, ver *semver.Version) {
ckey := backendClusterVersionKey()
ckey := buckets.ClusterClusterVersionKeyName
tx := be.BatchTx()
tx.Lock()
@@ -170,7 +170,7 @@ func mustSaveClusterVersionToBackend(be backend.Backend, ver *semver.Version) {
// The field is populated since etcd v3.5.
func mustSaveDowngradeToBackend(lg *zap.Logger, be backend.Backend, downgrade *DowngradeInfo) {
dkey := backendDowngradeKey()
dkey := buckets.ClusterDowngradeKeyName
dvalue, err := json.Marshal(downgrade)
if err != nil {
lg.Panic("failed to marshal downgrade information", zap.Error(err))
@@ -281,18 +281,6 @@ func nodeToMember(lg *zap.Logger, n *v2store.NodeExtern) (*Member, error) {
return m, nil
}
func backendMemberKey(id types.ID) []byte {
return []byte(id.String())
}
func backendClusterVersionKey() []byte {
return []byte("clusterVersion")
}
func backendDowngradeKey() []byte {
return []byte("downgrade")
}
func mustCreateBackendBuckets(be backend.Backend) {
tx := be.BatchTx()
tx.Lock()