Skip to content

Commit e3cd57a

Browse files
committed
overwrite the member if already exist
When promoting a learner, the member is definitely already exist. Signed-off-by: Benjamin Wang <[email protected]>
1 parent d32c22d commit e3cd57a

File tree

3 files changed

+2
-11
lines changed

3 files changed

+2
-11
lines changed

server/etcdserver/api/membership/cluster_test.go

-6
Original file line numberDiff line numberDiff line change
@@ -1048,12 +1048,6 @@ func TestAddMemberSyncsBackendAndStoreV2(t *testing.T) {
10481048
name: "Adding member should succeed if it was only in backend",
10491049
backendMembers: []*Member{alice},
10501050
},
1051-
{
1052-
name: "Adding member should fail if it exists in both",
1053-
storeV2Members: []*Member{alice},
1054-
backendMembers: []*Member{alice},
1055-
expectPanics: true,
1056-
},
10571051
{
10581052
name: "Adding member should fail if it exists in storeV2 and backend is nil",
10591053
storeV2Members: []*Member{alice},

server/etcdserver/api/membership/store.go

-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@ func unsafeSaveMemberToBackend(lg *zap.Logger, be backend.Backend, m *Member) er
5454
tx := be.BatchTx()
5555
tx.LockInsideApply()
5656
defer tx.Unlock()
57-
if unsafeMemberExists(tx, mkey) {
58-
return errMemberAlreadyExist
59-
}
6057
tx.UnsafePut(buckets.Members, mkey, mvalue)
6158
return nil
6259
}

server/etcdserver/server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2490,9 +2490,9 @@ func (s *EtcdServer) verifyV3StoreInSyncWithV2Store(shouldApplyV3 membership.Sho
24902490
v3Data, v3Err := json.Marshal(processedV3Members)
24912491

24922492
if v2Err != nil || v3Err != nil {
2493-
panic("members in v2store doesn't members in v3store")
2493+
panic("members in v2store doesn't match v3store")
24942494
}
2495-
panic(fmt.Sprintf("members in v2store doesn't v3store, v2store: %s, v3store: %s", string(v2Data), string(v3Data)))
2495+
panic(fmt.Sprintf("members in v2store doesn't match v3store, v2store: %s, v3store: %s", string(v2Data), string(v3Data)))
24962496
}
24972497
}
24982498

0 commit comments

Comments
 (0)