Revert "tests/robustness: Disable testing network blackhole until #15595 is fixed"

This reverts commit 013e25fab9f76f0c1a00459555fe42b33f379eb9.

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
This commit is contained in:
Marek Siarkowicz 2023-04-01 16:17:30 +02:00
parent 71ba0873e3
commit 03214c0239
2 changed files with 15 additions and 17 deletions

View File

@ -66,9 +66,8 @@ var (
CompactBeforeSetFinishedCompactPanic, CompactAfterSetFinishedCompactPanic, CompactBeforeSetFinishedCompactPanic, CompactAfterSetFinishedCompactPanic,
CompactBeforeCommitBatchPanic, CompactAfterCommitBatchPanic, CompactBeforeCommitBatchPanic, CompactAfterCommitBatchPanic,
RaftBeforeLeaderSendPanic, RaftBeforeLeaderSendPanic,
BlackholePeerNetwork,
DelayPeerNetwork, DelayPeerNetwork,
// TODO(https://github.com/etcd-io/etcd/issues/15595): Re-enable after issue is fixed
//BlackholePeerNetwork,
} }
RandomOneNodeClusterFailpoint Failpoint = randomFailpoint{oneNodeClusterFailpoints} RandomOneNodeClusterFailpoint Failpoint = randomFailpoint{oneNodeClusterFailpoints}
RaftBeforeFollowerSendPanic Failpoint = goPanicFailpoint{"raftBeforeFollowerSend", nil, Follower} RaftBeforeFollowerSendPanic Failpoint = goPanicFailpoint{"raftBeforeFollowerSend", nil, Follower}
@ -79,9 +78,8 @@ var (
RaftBeforeSaveSnapPanic Failpoint = goPanicFailpoint{"raftBeforeSaveSnap", triggerBlackholeUntilSnapshot, Follower} RaftBeforeSaveSnapPanic Failpoint = goPanicFailpoint{"raftBeforeSaveSnap", triggerBlackholeUntilSnapshot, Follower}
RaftAfterSaveSnapPanic Failpoint = goPanicFailpoint{"raftAfterSaveSnap", triggerBlackholeUntilSnapshot, Follower} RaftAfterSaveSnapPanic Failpoint = goPanicFailpoint{"raftAfterSaveSnap", triggerBlackholeUntilSnapshot, Follower}
RandomSnapshotFailpoint Failpoint = randomFailpoint{[]Failpoint{ RandomSnapshotFailpoint Failpoint = randomFailpoint{[]Failpoint{
// TODO(https://github.com/etcd-io/etcd/issues/15595): Re-enable after issue is fixed RaftBeforeApplySnapPanic, RaftAfterApplySnapPanic, RaftAfterWALReleasePanic, RaftBeforeSaveSnapPanic, RaftAfterSaveSnapPanic,
//RaftBeforeApplySnapPanic, RaftAfterApplySnapPanic, RaftAfterWALReleasePanic, RaftBeforeSaveSnapPanic, RaftAfterSaveSnapPanic, BlackholeUntilSnapshot,
//BlackholeUntilSnapshot,
}} }}
) )

View File

@ -137,18 +137,18 @@ func TestRobustness(t *testing.T) {
e2e.WithSnapshotCount(100), e2e.WithSnapshotCount(100),
), ),
}, },
// TODO(https://github.com/etcd-io/etcd/issues/15595): Re-enable after issue is fixed {
//{ name: "Snapshot",
// name: "Snapshot", failpoint: RandomSnapshotFailpoint,
// failpoint: RandomSnapshotFailpoint, traffic: &HighTraffic,
// traffic: &HighTraffic, config: *e2e.NewConfig(
// config: *e2e.NewConfig( e2e.WithGoFailEnabled(true),
// e2e.WithGoFailEnabled(true), e2e.WithSnapshotCount(100),
// e2e.WithSnapshotCount(100), e2e.WithSnapshotCatchUpEntries(100),
// e2e.WithSnapshotCatchUpEntries(100), e2e.WithPeerProxy(true),
// e2e.WithPeerProxy(true), e2e.WithIsPeerTLS(true),
// ), ),
//}, },
}...) }...)
for _, scenario := range scenarios { for _, scenario := range scenarios {
if scenario.traffic == nil { if scenario.traffic == nil {