upstream/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2026-06-14 20:13:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix etcd join timeout handling

Browse source 
Error is deadline exceeded, not cancelled

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
Brad Davidson 2025-08-27 17:26:29 +00:00 committed by Brad Davidson
parent 795091a809
commit f1c82392d0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/etcd/etcd.go
View file

@ -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