From a9016f3dcbd85fd1e8f21222d4954ccb1d727824 Mon Sep 17 00:00:00 2001
From: Brad Davidson <brad.davidson@rancher.com>
Date: Tue, 26 Aug 2025 00:30:07 +0000
Subject: [PATCH] Add retry on etcd MemberAdd timeout

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
---
 pkg/etcd/etcd.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkg/etcd/etcd.go b/pkg/etcd/etcd.go
index 5914ebca99..3ffac867de 100644
--- a/pkg/etcd/etcd.go
+++ b/pkg/etcd/etcd.go
@@ -100,6 +100,7 @@ var (
 	NodeAddressAnnotation = "etcd." + version.Program + ".cattle.io/node-address"
 
 	ErrAddressNotSet    = errors.New("apiserver addresses not yet set")
+	ErrJoinTimeout      = errors.New("MemberAdd request timed out")
 	ErrNotMember        = errNotMember()
 	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)
 							return false, nil
 						}
+						if errors.Is(err, ErrJoinTimeout) {
+							logrus.Infof("Retrying etcd cluster join: %v", err)
+							return false, nil
+						}
 						return false, err
 					}
 					return true, nil
@@ -621,6 +626,9 @@ func (e *ETCD) join(ctx context.Context, clientAccessInfo *clientaccess.Info) er
 	if add {
 		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 errors.Is(err, context.Canceled) {
+				return ErrJoinTimeout
+			}
 			return err
 		}
 		cluster = append(cluster, fmt.Sprintf("%s=%s", e.name, e.peerURL()))