Skip to content

Automated cherry pick of #20840 #21572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pjsharath28 wants to merge 1 commit into
base: release-3.6
Choose a base branch
from
+5 −4
Open

Automated cherry pick of #20840 #21572

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions tests/framework/e2e/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ package e2e

import (
"context"
"errors"
"flag"
"fmt"
"maps"
Expand Down Expand Up @@ -847,19 +846,21 @@ func (epc *EtcdProcessCluster) CloseProc(ctx context.Context, finder func(EtcdPr
return fmt.Errorf("failed to find member ID: %w", err)
}

sleepDuration := 500 * time.Millisecond
maxRetries := int((2 * etcdserver.HealthInterval) / sleepDuration)
memberRemoved := false
for i := 0; i < 10; i++ {
for i := 0; i < maxRetries; i++ {
_, err := memberCtl.MemberRemove(ctx, memberID)
if err != nil && strings.Contains(err.Error(), "member not found") {
memberRemoved = true
break
}

time.Sleep(500 * time.Millisecond)
time.Sleep(sleepDuration)
}

if !memberRemoved {
return errors.New("failed to remove member after 10 tries")
return fmt.Errorf("failed to remove member after %d tries", maxRetries)
}

epc.lg.Info("successfully removed member", zap.String("acurl", proc.Config().ClientURL))
Expand Down