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

tests/robustness: Disable blackhole until snapshot for v3.5 and v3.4 

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
dependabot/go_modules/github.com/prometheus/procfs-0.11.0
Marek Siarkowicz 2023-06-15 17:23:47 +02:00
parent 7d27e33a12
commit fb16bca44a
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robustness/failpoints.go
View File

@ -25,7 +25,6 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
healthpb "google.golang.org/grpc/health/grpc_health_v1" healthpb "google.golang.org/grpc/health/grpc_health_v1"
"go.etcd.io/etcd/api/v3/version"
clientv3 "go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/tests/v3/framework/e2e" "go.etcd.io/etcd/tests/v3/framework/e2e"
) )
@ -403,12 +402,7 @@ func (tb triggerBlackhole) Trigger(t *testing.T, ctx context.Context, member e2e
} }
func (tb triggerBlackhole) Available(config e2e.EtcdProcessClusterConfig, process e2e.EtcdProcess) bool { func (tb triggerBlackhole) Available(config e2e.EtcdProcessClusterConfig, process e2e.EtcdProcess) bool {
v, err := e2e.GetVersionFromBinary(e2e.BinPath.Etcd) if tb.waitTillSnapshot && config.SnapshotCatchUpEntries > 100 {
if err != nil {
panic(err)
}
// TODO: Deflake waiting for snapshot for v3.4.X
if tb.waitTillSnapshot && v.LessThan(version.V3_5) {
return false return false
} }
return config.ClusterSize > 1 && process.PeerProxy() != nil return config.ClusterSize > 1 && process.PeerProxy() != nil

4
tests/robustness/linearizability_test.go
View File

@ -102,12 +102,14 @@ func TestRobustness(t *testing.T) {
e2e.WithClusterSize(1), e2e.WithClusterSize(1),
), ),
}) })
if v.Compare(version.V3_5) >= 0 { // TODO: Deflake waiting for waiting until snapshot for etcd versions that don't support setting snapshot catchup entries.
if v.Compare(version.V3_6) >= 0 {
scenarios = append(scenarios, testScenario{ scenarios = append(scenarios, testScenario{
name: "Issue15271", name: "Issue15271",
failpoint: BlackholeUntilSnapshot, failpoint: BlackholeUntilSnapshot,
traffic: traffic.HighTraffic, traffic: traffic.HighTraffic,
cluster: *e2e.NewConfig( cluster: *e2e.NewConfig(
e2e.WithSnapshotCatchUpEntries(100),
e2e.WithSnapshotCount(100), e2e.WithSnapshotCount(100),
e2e.WithPeerProxy(true), e2e.WithPeerProxy(true),
e2e.WithIsPeerTLS(true), e2e.WithIsPeerTLS(true),