Fix etcd join timeout handling

brandond · brandond · commit f1c82392d02b · 2025-08-27T13:41:54.000-07:00
Error is deadline exceeded, not cancelled

Signed-off-by: Brad Davidson &lt;brad.davidson@rancher.com&gt;
diff --git a/pkg/etcd/etcd.go b/pkg/etcd/etcd.go
@@ -626,7 +626,7 @@ 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) {
+			if errors.Is(err, context.DeadlineExceeded) {
 				return ErrJoinTimeout
 			}
 			return err

Original file line number	Diff line number	Diff line change
`@@ -626,7 +626,7 @@ func (e ETCD) join(ctx context.Context, clientAccessInfo clientaccess.Info) er`
`626`	`626`	`if add {`
`627`	`627`	`logrus.Infof("Adding member %s=%s to etcd cluster %v", e.name, e.peerURL(), cluster)`
`628`	`628`	`if _, err = client.MemberAddAsLearner(clientCtx, []string{e.peerURL()}); err != nil {`
`629`		`- if errors.Is(err, context.Canceled) {`
	`629`	`+ if errors.Is(err, context.DeadlineExceeded) {`
`630`	`630`	`return ErrJoinTimeout`
`631`	`631`	`}`
`632`	`632`	`return err`