From 4a848cd5d90db815e37d431fbcfd8e110bd2c25e Mon Sep 17 00:00:00 2001 From: Gang Li Date: Tue, 21 Jan 2025 14:35:50 -0800 Subject: [PATCH] use experimental flag in robustness scenario Signed-off-by: Gang Li --- tests/framework/e2e/cluster.go | 4 ++++ tests/robustness/main_test.go | 2 +- tests/robustness/scenarios/scenarios.go | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/framework/e2e/cluster.go b/tests/framework/e2e/cluster.go index 66a61c972bc4..3a2f8388835d 100644 --- a/tests/framework/e2e/cluster.go +++ b/tests/framework/e2e/cluster.go @@ -388,6 +388,10 @@ func WithWatchProcessNotifyInterval(interval time.Duration) EPClusterOption { return func(c *EtcdProcessClusterConfig) { c.ServerConfig.WatchProgressNotifyInterval = interval } } +func WithExperimentalWatchProcessNotifyInterval(interval time.Duration) EPClusterOption { + return func(c *EtcdProcessClusterConfig) { c.ServerConfig.ExperimentalWatchProgressNotifyInterval = interval } +} + func WithEnvVars(ev map[string]string) EPClusterOption { return func(c *EtcdProcessClusterConfig) { c.EnvVars = ev } } diff --git a/tests/robustness/main_test.go b/tests/robustness/main_test.go index 91b55186207d..11da8bdcdee9 100644 --- a/tests/robustness/main_test.go +++ b/tests/robustness/main_test.go @@ -99,7 +99,7 @@ func testRobustness(ctx context.Context, t *testing.T, lg *zap.Logger, s scenari failpointImpactingWatch := s.Failpoint == failpoint.SleepBeforeSendWatchResponse if !failpointImpactingWatch { - watchProgressNotifyEnabled := c.Cfg.ServerConfig.WatchProgressNotifyInterval != 0 + watchProgressNotifyEnabled := c.Cfg.ServerConfig.ExperimentalWatchProgressNotifyInterval != 0 client.ValidateGotAtLeastOneProgressNotify(t, r.Client, s.Watch.RequestProgress || watchProgressNotifyEnabled) } validateConfig := validate.Config{ExpectRevisionUnique: s.Traffic.ExpectUniqueRevision()} diff --git a/tests/robustness/scenarios/scenarios.go b/tests/robustness/scenarios/scenarios.go index e4e7378d8223..0c4aac2fb93f 100644 --- a/tests/robustness/scenarios/scenarios.go +++ b/tests/robustness/scenarios/scenarios.go @@ -98,7 +98,7 @@ func Exploratory(_ *testing.T) []TestScenario { e2e.WithGoFailEnabled(true), // Set low minimal compaction batch limit to allow for triggering multi batch compaction failpoints. options.WithExperimentalCompactionBatchLimit(10, 100, 1000), - e2e.WithWatchProcessNotifyInterval(100 * time.Millisecond), + e2e.WithExperimentalWatchProcessNotifyInterval(100 * time.Millisecond), } if e2e.CouldSetSnapshotCatchupEntries(e2e.BinPath.Etcd) {