test pull/17793

etcd-io · Apr 21, 2024 · 67debe4 · 67debe4
1 parent 2674f94
commit 67debe4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -31,7 +31,7 @@ jobs:
               VERBOSE=1 GOOS=linux GOARCH=amd64 CPU=4 EXPECT_DEBUG=true make test-e2e-release
               ;;
             linux-386-e2e)
-              VERBOSE=1 GOOS=linux GOARCH=386 CPU=4 EXPECT_DEBUG=true make test-e2e
+              VERBOSE=1 GOOS=linux GOARCH=386 CPU=4 EXPECT_DEBUG=true GO_TEST_FLAGS="-v --count=20 --timeout=3h" make test-e2e
               ;;
             *)
               echo "Failed to find target"

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)