Monkey patch

Open watch every time on all nodes

.

Author: henrybear327

tests/robustness/Makefile

@@ -82,7 +82,7 @@ test-robustness-issue20573: /tmp/etcd-v3.6.4-failpoints/bin
 
 .PHONY: test-robustness-issue20221
 test-robustness-issue20221: /tmp/etcd-866bc0717c0b56579514c7363f3f47f6cd4109c6-failpoints/bin
-	GO_TEST_FLAGS='-v -run=TestRobustnessRegression/issue20221 -count 200 -failfast --bin-dir=/tmp/etcd-866bc0717c0b56579514c7363f3f47f6cd4109c6-failpoints/bin' $(TOPLEVEL_MAKE) test-robustness && \
+	GO_TEST_FLAGS='-v -run=TestRobustnessRegression/issue20221 -count 200 -failfast -timeout 10h --bin-dir=/tmp/etcd-866bc0717c0b56579514c7363f3f47f6cd4109c6-failpoints/bin' $(TOPLEVEL_MAKE) test-robustness && \
 	  echo "Failed to reproduce" || echo "Successful reproduction"
 
 # Etcd API usage by Kubernetes

tests/robustness/client/watch.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"os"
 	"time"
 
 	"go.uber.org/zap"
@@ -153,6 +154,7 @@ func openWatchPeriodically(ctx context.Context, g *errgroup.Group, c *RecordingC
 	for {
 		select {
 		case <-ctx.Done():
+			os.Exit(1)
 			return ctx.Err()
 		case <-finish:
 			return nil

tests/robustness/main_test.go

@@ -179,7 +179,7 @@ func runScenario(ctx context.Context, t *testing.T, s scenarios.TestScenario, lg
 	})
 	err := g.Wait()
 	if err != nil {
-		t.Error(err)
+		// t.Error(err)
 	}
 
 	err = client.CheckEndOfTestHashKV(ctx, clus)

tests/robustness/scenarios/scenarios.go

@@ -294,7 +294,7 @@ func Regression(t *testing.T) []TestScenario {
 
 	scenarios = append(scenarios, TestScenario{
 		Name:      "issue20573",
-		Profile:   traffic.HighTrafficProfile.WithoutCompaction().WithContinuousWatchCreationInterval(10 * time.Millisecond).WithContinuousWatchCreationRevisionOffset(-10),
+		Profile:   traffic.HighTrafficProfile.WithoutCompaction().WithBackgroundWatchConfigInterval(10 * time.Millisecond).WithBackgroundWatchConfigRevisionOffset(-10),
 		Failpoint: failpoint.RaftAfterSaveSnapPanic,
 		Traffic:   traffic.Kubernetes,
 		Cluster: *e2e.NewConfig(
@@ -309,10 +309,10 @@ func Regression(t *testing.T) []TestScenario {
 	})
 
 	scenarios = append(scenarios, TestScenario{
-		Name:      "issue20221",
-		Profile:   traffic.HighTrafficProfile.WithoutCompaction().WithContinuousWatchCreationInterval(10 * time.Millisecond).WithContinuousWatchCreationRevisionOffset(100),
-		Failpoint: failpoint.RaftAfterSaveSnapPanic,
-		// Failpoint: failpoint.RaftBeforeApplySnapPanic,
+		Name:    "issue20221",
+		Profile: traffic.HighTrafficProfile.WithoutCompaction().WithBackgroundWatchConfigInterval(5 * time.Millisecond).WithBackgroundWatchConfigRevisionOffset(5),
+		// Failpoint: failpoint.RaftAfterSaveSnapPanic,
+		Failpoint: failpoint.RaftBeforeApplySnapPanic,
 		// Failpoint: failpoint.RaftAfterApplySnapPanic,
 		// Failpoint: failpoint.RaftAfterWALReleasePanic,
 		Traffic: traffic.Kubernetes,