Merge pull request #17793 from mneverov/fix-quorum-check

Fix remove member failed.
etcd-io · Apr 30, 2024 · d31caae · d31caae
2 parents 09f7d7a + 6b0b4ce
commit d31caae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/server/etcdserver/server.go b/server/etcdserver/server.go
@@ -86,7 +86,7 @@ const (
 	StoreKeysPrefix    = "/1"
 
 	// HealthInterval is the minimum time the cluster should be healthy
-	// before accepting add member requests.
+	// before accepting add and delete member requests.
 	HealthInterval = 5 * time.Second
 
 	purgeFileInterval = 30 * time.Second

diff --git a/tests/common/member_test.go b/tests/common/member_test.go
@@ -196,7 +196,7 @@ func TestMemberRemove(t *testing.T) {
 				continue
 			}
 			t.Run(quorumTc.name+"/"+clusterTc.name, func(t *testing.T) {
-				ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+				ctx, cancel := context.WithTimeout(context.Background(), 14*time.Second)
 				defer cancel()
 				c := clusterTc.config
 				c.StrictReconfigCheck = quorumTc.strictReconfigCheck
@@ -207,7 +207,8 @@ func TestMemberRemove(t *testing.T) {
 
 				testutils.ExecuteUntil(ctx, t, func() {
 					if quorumTc.waitForQuorum {
-						time.Sleep(etcdserver.HealthInterval)
+						// wait for health interval + leader election
+						time.Sleep(etcdserver.HealthInterval + 2*time.Second)
 					}
 
 					memberID, clusterID := memberToRemove(ctx, t, cc, c.ClusterSize)