Merge pull request #15601 from serathius/robustness-disable-blackhole

tests/robustness: Disable testing network blackhole until #15595 is fixed
This commit is contained in:
Marek Siarkowicz 2023-03-31 15:04:24 +02:00 committed by GitHub
commit 4529f01876
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 14 deletions

View File

@ -66,8 +66,9 @@ 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}
@ -78,8 +79,9 @@ var (
RaftBeforeSaveSnapPanic Failpoint = goPanicFailpoint{"raftBeforeSaveSnap", triggerBlackholeUntilSnapshot, Follower}
RaftAfterSaveSnapPanic Failpoint = goPanicFailpoint{"raftAfterSaveSnap", triggerBlackholeUntilSnapshot, Follower}
RandomSnapshotFailpoint Failpoint = randomFailpoint{[]Failpoint{
RaftBeforeApplySnapPanic, RaftAfterApplySnapPanic, RaftAfterWALReleasePanic, RaftBeforeSaveSnapPanic, RaftAfterSaveSnapPanic,
BlackholeUntilSnapshot,
// TODO(https://github.com/etcd-io/etcd/issues/15595): Re-enable after issue is fixed
//RaftBeforeApplySnapPanic, RaftAfterApplySnapPanic, RaftAfterWALReleasePanic, RaftBeforeSaveSnapPanic, RaftAfterSaveSnapPanic,
//BlackholeUntilSnapshot,
}}
)

View File

@ -136,17 +136,18 @@ func TestRobustness(t *testing.T) {
e2e.WithSnapshotCount(100),
),
},
{
name: "Snapshot",
failpoint: RandomSnapshotFailpoint,
traffic: &HighTraffic,
config: *e2e.NewConfig(
e2e.WithGoFailEnabled(true),
e2e.WithSnapshotCount(100),
e2e.WithSnapshotCatchUpEntries(100),
e2e.WithPeerProxy(true),
),
},
// 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),
// ),
//},
}...)
for _, scenario := range scenarios {
if scenario.traffic == nil {