Merge pull request #21572 from pjsharath28/automated-cherry-pick-of-#20840-upstream-release-3.6

Automated cherry pick of #20840

Author: ahrtr

tests/framework/e2e/cluster.go

@@ -16,7 +16,6 @@ package e2e
 
 import (
 	"context"
-	"errors"
 	"flag"
 	"fmt"
 	"maps"
@@ -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))