github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: check the member list status before adding or removing an etcd member

Browse Source
This commit is contained in:
SataQiu 2024-09-24 22:53:42 +08:00
parent f22fd52e91
commit 0166d23783
1 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
cmd/kubeadm/app/util/etcd/etcd.go
View File

@ -360,8 +360,28 @@ func (c *Client) RemoveMember(id uint64) ([]Member, error) {
defer func() { _ = cli.Close() }()
ctx, cancel := context.WithTimeout(context.Background(), etcdTimeout)
defer cancel()
// List members and quickly return if the member does not exist.
listResp, err := cli.MemberList(ctx)
if err != nil {
klog.V(5).Infof("Failed to check whether the member %s exists: %v", strconv.FormatUint(id, 16), err)
lastError = err
return false, nil
}
found := false
for _, member := range listResp.Members {
if member.GetID() == id {
found = true
break
}
}
if !found {
klog.V(5).Infof("Member %s was not found; assuming it was already removed", strconv.FormatUint(id, 16))
return true, nil
}
resp, err = cli.MemberRemove(ctx, id)
cancel()
if err == nil {
return true, nil
}
@ -427,6 +447,27 @@ func (c *Client) addMember(name string, peerAddrs string, isLearner bool) ([]Mem
true, func(_ context.Context) (bool, error) {
ctx, cancel := context.WithTimeout(context.Background(), etcdTimeout)
defer cancel()
// List members and quickly return if the member already exists.
listResp, err := cli.MemberList(ctx)
if err != nil {
klog.V(5).Infof("Failed to check whether the member %q exists: %v", peerAddrs, err)
lastError = err
return false, nil
}
found := false
for _, member := range listResp.Members {
if member.GetPeerURLs()[0] == peerAddrs {
found = true
break
}
}
if found {
klog.V(5).Infof("The peer URL %q for the added etcd member already exists. Skipping etcd member addition", peerAddrs)
respMembers = listResp.Members
return true, nil
}
if isLearner {
klog.V(1).Infof("[etcd] Adding etcd member %q as learner", peerAddrs)
resp, err = cli.MemberAddAsLearner(ctx, []string{peerAddrs})