From 5a19e1101d34d6bb2260bd7fd6cdb606d9bf84fb Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Fri, 17 Jan 2025 14:14:22 +0100 Subject: [PATCH] Fix passing compaction-batch-limit to etcd v3.4 and v3.5 Signed-off-by: Marek Siarkowicz --- tests/robustness/options/server_config_options.go | 4 ++-- tests/robustness/scenarios/scenarios.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/robustness/options/server_config_options.go b/tests/robustness/options/server_config_options.go index 99fe2acef4a..ade51592cd1 100644 --- a/tests/robustness/options/server_config_options.go +++ b/tests/robustness/options/server_config_options.go @@ -26,9 +26,9 @@ func WithSnapshotCount(input ...uint64) e2e.EPClusterOption { } } -func WithCompactionBatchLimit(input ...int) e2e.EPClusterOption { +func WithExperimentalCompactionBatchLimit(input ...int) e2e.EPClusterOption { return func(c *e2e.EtcdProcessClusterConfig) { - c.ServerConfig.CompactionBatchLimit = input[internalRand.Intn(len(input))] + c.ServerConfig.ExperimentalCompactionBatchLimit = input[internalRand.Intn(len(input))] } } diff --git a/tests/robustness/scenarios/scenarios.go b/tests/robustness/scenarios/scenarios.go index c9c27a751eb..e4e7378d822 100644 --- a/tests/robustness/scenarios/scenarios.go +++ b/tests/robustness/scenarios/scenarios.go @@ -97,7 +97,7 @@ func Exploratory(_ *testing.T) []TestScenario { options.WithSubsetOptions(randomizableOptions...), e2e.WithGoFailEnabled(true), // Set low minimal compaction batch limit to allow for triggering multi batch compaction failpoints. - options.WithCompactionBatchLimit(10, 100, 1000), + options.WithExperimentalCompactionBatchLimit(10, 100, 1000), e2e.WithWatchProcessNotifyInterval(100 * time.Millisecond), } @@ -219,7 +219,7 @@ func Regression(t *testing.T) []TestScenario { Traffic: traffic.Kubernetes, Cluster: *e2e.NewConfig( e2e.WithClusterSize(1), - e2e.WithCompactionBatchLimit(300), + e2e.WithExperimentalCompactionBatchLimit(300), e2e.WithSnapshotCount(1000), e2e.WithGoFailEnabled(true), ),