Prevent picking a failpoint that waiting till snapshot that doesn't s…

…upport lower snapshot catchup entries but allow reproducing issue etcd-io#15271
serathius · May 13, 2024 · 1b16c3b · 1b16c3b
1 parent 333bd7b
commit 1b16c3b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/tests/robustness/failpoint/network.go b/tests/robustness/failpoint/network.go
@@ -57,6 +57,9 @@ func (tb triggerBlackhole) Trigger(ctx context.Context, t *testing.T, member e2e
 }
 
 func (tb triggerBlackhole) Available(config e2e.EtcdProcessClusterConfig, process e2e.EtcdProcess) bool {
+	if tb.waitTillSnapshot && config.ServerConfig.SnapshotCatchUpEntries > 100 {
+		return false
+	}
 	return config.ClusterSize > 1 && process.PeerProxy() != nil
 }
 

diff --git a/tests/robustness/main_test.go b/tests/robustness/main_test.go
@@ -78,10 +78,6 @@ func testRobustness(ctx context.Context, t *testing.T, lg *zap.Logger, s testSce
 			t.Fatal(err)
 		}
 	}
-	err = failpoint.Validate(r.Cluster, s.failpoint)
-	if err != nil {
-		t.Fatal(err)
-	}
 
 	// t.Failed() returns false during panicking. We need to forcibly
 	// save data on panicking.