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

Enable test to verify membership recovery from backend

Browse Source 
Signed-off-by: Geeta Gharpure <geetagh@amazon.com>
This commit is contained in:
Geeta Gharpure 2023-06-13 18:33:03 +00:00
parent 693f25d6b9
commit e9fa3d30d7
1 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
server/etcdserver/api/membership/membership_test.go
View File

@ -22,13 +22,14 @@ import (
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/server/v3/etcdserver/version" "go.etcd.io/etcd/server/v3/etcdserver/version"
serverversion "go.etcd.io/etcd/server/v3/etcdserver/version"
"go.uber.org/zap" "go.uber.org/zap"
) )
func TestAddRemoveMember(t *testing.T) { func TestAddRemoveMember(t *testing.T) {
c := newTestCluster(t, nil) c := newTestCluster(t, nil)
be := &backendMock{} be := newMembershipBackend()
c.SetBackend(be) c.SetBackend(be)
c.AddMember(newTestMemberAsLearner(17, nil, "node17", nil), true) c.AddMember(newTestMemberAsLearner(17, nil, "node17", nil), true)
c.RemoveMember(17, true) c.RemoveMember(17, true)
@ -39,34 +40,60 @@ func TestAddRemoveMember(t *testing.T) {
c.RemoveMember(17, true) c.RemoveMember(17, true)
c.RemoveMember(18, true) c.RemoveMember(18, true)
if false { c.AddMember(newTestMember(19, nil, "node19", nil), true)
// TODO: Enable this code when Recover is reading membership from the backend.
// Recover from backend
c2 := newTestCluster(t, nil) c2 := newTestCluster(t, nil)
c2.SetBackend(be) c2.SetBackend(be)
c2.Recover(func(*zap.Logger, *semver.Version) {}) c2.Recover(func(*zap.Logger, *semver.Version) {})
assert.Equal(t, []*Member{{ID: types.ID(18), assert.Equal(t, []*Member{{ID: types.ID(19),
Attributes: Attributes{Name: "node18"}}}, c2.Members()) Attributes: Attributes{Name: "node19"}}}, c2.Members())
assert.Equal(t, true, c2.IsIDRemoved(17)) assert.Equal(t, true, c2.IsIDRemoved(17))
assert.Equal(t, false, c2.IsIDRemoved(18)) assert.Equal(t, true, c2.IsIDRemoved(18))
} assert.Equal(t, false, c2.IsIDRemoved(19))
} }
type backendMock struct { type backendMock struct {
members map[types.ID]*Member
removed map[types.ID]bool
version *semver.Version
downgradeInfo *version.DowngradeInfo
} }
var _ MembershipBackend = (*backendMock)(nil) var _ MembershipBackend = (*backendMock)(nil)
func newMembershipBackend() MembershipBackend {
return &backendMock{
members: make(map[types.ID]*Member),
removed: make(map[types.ID]bool),
downgradeInfo: &serverversion.DowngradeInfo{Enabled: false},
}
}
func (b *backendMock) MustCreateBackendBuckets() {} func (b *backendMock) MustCreateBackendBuckets() {}
func (b *backendMock) ClusterVersionFromBackend() *semver.Version { return nil } func (b *backendMock) ClusterVersionFromBackend() *semver.Version { return b.version }
func (b *backendMock) MustSaveClusterVersionToBackend(version *semver.Version) {} func (b *backendMock) MustSaveClusterVersionToBackend(version *semver.Version) {
b.version = version
}
func (b *backendMock) MustReadMembersFromBackend() (x map[types.ID]*Member, y map[types.ID]bool) { func (b *backendMock) MustReadMembersFromBackend() (x map[types.ID]*Member, y map[types.ID]bool) {
return return b.members, b.removed
}
func (b *backendMock) MustSaveMemberToBackend(m *Member) {
b.members[m.ID] = m
}
func (b *backendMock) TrimMembershipFromBackend() error {
b.members = make(map[types.ID]*Member)
b.removed = make(map[types.ID]bool)
return nil
}
func (b *backendMock) MustDeleteMemberFromBackend(id types.ID) {
delete(b.members, id)
b.removed[id] = true
} }
func (b *backendMock) MustSaveMemberToBackend(*Member) {}
func (b *backendMock) TrimMembershipFromBackend() error { return nil }
func (b *backendMock) MustDeleteMemberFromBackend(types.ID) {}
func (b *backendMock) MustSaveDowngradeToBackend(*version.DowngradeInfo) {} func (b *backendMock) MustSaveDowngradeToBackend(downgradeInfo *version.DowngradeInfo) {
func (b *backendMock) DowngradeInfoFromBackend() *version.DowngradeInfo { return nil } b.downgradeInfo = downgradeInfo
}
func (b *backendMock) DowngradeInfoFromBackend() *version.DowngradeInfo { return b.downgradeInfo }