vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #15610 from serathius/robustness-fix-blackhole 

Robustness fix blackhole
storage-doc
Marek Siarkowicz 2023-04-02 19:34:09 +02:00 committed by GitHub
parent 5d53c83d61 03214c0239
commit a1bd154cb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/framework/e2e/cluster.go
View File

@ -478,6 +478,9 @@ func (cfg *EtcdProcessClusterConfig) EtcdServerProcessConfig(tb testing.TB, i in
peerAdvertiseUrl := url.URL{Scheme: cfg.PeerScheme(), Host: fmt.Sprintf("localhost:%d", peerPort)}
var proxyCfg *proxy.ServerConfig
if cfg.PeerProxy {
if !cfg.IsPeerTLS {
panic("Can't use peer proxy without peer TLS as it can result in malformed packets")
}
peerAdvertiseUrl.Host = fmt.Sprintf("localhost:%d", peer2Port)
proxyCfg = &proxy.ServerConfig{
Logger: zap.NewNop(),

8
tests/robustness/failpoints.go
View File

@ -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,
}}
)

25
tests/robustness/linearizability_test.go
View File

@ -103,6 +103,7 @@ func TestRobustness(t *testing.T) {
failpoint: RandomMultiNodeClusterFailpoint,
traffic: &traffic,
config: *e2e.NewConfig(
e2e.WithIsPeerTLS(true),
e2e.WithSnapshotCount(100),
e2e.WithPeerProxy(true),
e2e.WithGoFailEnabled(true),
@ -136,18 +137,18 @@ 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),
e2e.WithIsPeerTLS(true),
),
},
}...)
for _, scenario := range scenarios {
if scenario.traffic == nil {