From 479d9a7e3d7e5a4f126c95d889f6e6786f28ed54 Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Sat, 1 Apr 2023 16:17:30 +0200 Subject: [PATCH] Revert "tests/robustness: Disable testing network blackhole until #15595 is fixed" This reverts commit 013e25fab9f76f0c1a00459555fe42b33f379eb9. Signed-off-by: Marek Siarkowicz --- tests/robustness/failpoints.go | 8 +++----- tests/robustness/linearizability_test.go | 23 +++++++++++------------ 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/tests/robustness/failpoints.go b/tests/robustness/failpoints.go index 9fb3d5a2bbad..1f72ad5248e4 100644 --- a/tests/robustness/failpoints.go +++ b/tests/robustness/failpoints.go @@ -66,9 +66,8 @@ var ( CompactBeforeSetFinishedCompactPanic, CompactAfterSetFinishedCompactPanic, CompactBeforeCommitBatchPanic, CompactAfterCommitBatchPanic, RaftBeforeLeaderSendPanic, + BlackholePeerNetwork, DelayPeerNetwork, - // TODO(https://github.com/etcd-io/etcd/issues/15595): Re-enable after issue is fixed - //BlackholePeerNetwork, } RandomOneNodeClusterFailpoint Failpoint = randomFailpoint{oneNodeClusterFailpoints} RaftBeforeFollowerSendPanic Failpoint = goPanicFailpoint{"raftBeforeFollowerSend", nil, Follower} @@ -79,9 +78,8 @@ var ( RaftBeforeSaveSnapPanic Failpoint = goPanicFailpoint{"raftBeforeSaveSnap", triggerBlackholeUntilSnapshot, Follower} RaftAfterSaveSnapPanic Failpoint = goPanicFailpoint{"raftAfterSaveSnap", triggerBlackholeUntilSnapshot, Follower} RandomSnapshotFailpoint Failpoint = randomFailpoint{[]Failpoint{ - // TODO(https://github.com/etcd-io/etcd/issues/15595): Re-enable after issue is fixed - //RaftBeforeApplySnapPanic, RaftAfterApplySnapPanic, RaftAfterWALReleasePanic, RaftBeforeSaveSnapPanic, RaftAfterSaveSnapPanic, - //BlackholeUntilSnapshot, + RaftBeforeApplySnapPanic, RaftAfterApplySnapPanic, RaftAfterWALReleasePanic, RaftBeforeSaveSnapPanic, RaftAfterSaveSnapPanic, + BlackholeUntilSnapshot, }} ) diff --git a/tests/robustness/linearizability_test.go b/tests/robustness/linearizability_test.go index 806963befaa0..3135ec325e06 100644 --- a/tests/robustness/linearizability_test.go +++ b/tests/robustness/linearizability_test.go @@ -137,18 +137,17 @@ func TestRobustness(t *testing.T) { e2e.WithSnapshotCount(100), ), }, - // TODO(https://github.com/etcd-io/etcd/issues/15595): Re-enable after issue is fixed - //{ - // name: "Snapshot", - // failpoint: RandomSnapshotFailpoint, - // traffic: &HighTraffic, - // config: *e2e.NewConfig( - // e2e.WithGoFailEnabled(true), - // e2e.WithSnapshotCount(100), - // e2e.WithSnapshotCatchUpEntries(100), - // e2e.WithPeerProxy(true), - // ), - //}, + { + name: "Snapshot", + failpoint: RandomSnapshotFailpoint, + traffic: &HighTraffic, + config: *e2e.NewConfig( + e2e.WithGoFailEnabled(true), + e2e.WithSnapshotCount(100), + e2e.WithSnapshotCatchUpEntries(100), + e2e.WithPeerProxy(true), + ), + }, }...) for _, scenario := range scenarios { if scenario.traffic == nil {