public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-07-28 20:29:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add retry on etcd MemberAdd timeout

Browse Source 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
Brad Davidson
2025-08-26 00:30:07 +00:00
committed by Brad Davidson
parent 0ec47408e9
commit a9016f3dcb
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/etcd/etcd.go
View File

@@ -100,6 +100,7 @@ var (
NodeAddressAnnotation = "etcd." + version.Program + ".cattle.io/node-address" NodeAddressAnnotation = "etcd." + version.Program + ".cattle.io/node-address"
ErrAddressNotSet = errors.New("apiserver addresses not yet set") ErrAddressNotSet = errors.New("apiserver addresses not yet set")
ErrJoinTimeout = errors.New("MemberAdd request timed out")
ErrNotMember = errNotMember() ErrNotMember = errNotMember()
ErrMemberListFailed = errMemberListFailed() ErrMemberListFailed = errMemberListFailed()
) )
@@ -512,6 +513,10 @@ func (e *ETCD) Start(ctx context.Context, clientAccessInfo *clientaccess.Info) e
logrus.Infof("Waiting to retrieve etcd cluster member list: %v", err) logrus.Infof("Waiting to retrieve etcd cluster member list: %v", err)
return false, nil return false, nil
} }
if errors.Is(err, ErrJoinTimeout) {
logrus.Infof("Retrying etcd cluster join: %v", err)
return false, nil
}
return false, err return false, err
} }
return true, nil return true, nil
@@ -621,6 +626,9 @@ func (e *ETCD) join(ctx context.Context, clientAccessInfo *clientaccess.Info) er
if add { if add {
logrus.Infof("Adding member %s=%s to etcd cluster %v", e.name, e.peerURL(), cluster) logrus.Infof("Adding member %s=%s to etcd cluster %v", e.name, e.peerURL(), cluster)
if _, err = client.MemberAddAsLearner(clientCtx, []string{e.peerURL()}); err != nil { if _, err = client.MemberAddAsLearner(clientCtx, []string{e.peerURL()}); err != nil {
if errors.Is(err, context.Canceled) {
return ErrJoinTimeout
}
return err return err
} }
cluster = append(cluster, fmt.Sprintf("%s=%s", e.name, e.peerURL())) cluster = append(cluster, fmt.Sprintf("%s=%s", e.name, e.peerURL()))