GC remaining persistence throttling tuning flags.

3 files changed, 0 insertions, 61 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
index e4234581cc1..2520dda2ed0 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
@@ -67,10 +67,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private int maxUnCommittedMemory = 123456;
     private List<String> zoneDnsSuffixes = List.of();
     private int maxCompactBuffers = 1;
-    private double persistenceThrottlingWsDecrementFactor = 1.2;
-    private double persistenceThrottlingWsBackoff = 0.95;
-    private int persistenceThrottlingWindowSize = -1;
-    private double persistenceThrottlingWsResizeRate = 3.0;
     private boolean useV8GeoPositions = true;
     private List<String> environmentVariables = List.of();
     private boolean loadCodeAsHugePages = false;
@@ -125,10 +121,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     @Override public int maxUnCommittedMemory() { return maxUnCommittedMemory; }
     @Override public List<String> zoneDnsSuffixes() { return zoneDnsSuffixes; }
     @Override public int maxCompactBuffers() { return maxCompactBuffers; }
-    @Override public double persistenceThrottlingWsDecrementFactor() { return persistenceThrottlingWsDecrementFactor; }
-    @Override public double persistenceThrottlingWsBackoff() { return persistenceThrottlingWsBackoff; }
-    @Override public int persistenceThrottlingWindowSize() { return persistenceThrottlingWindowSize; }
-    @Override public double persistenceThrottlingWsResizeRate() { return persistenceThrottlingWsResizeRate; }
     @Override public boolean useV8GeoPositions() { return useV8GeoPositions; }
     @Override public List<String> environmentVariables() { return environmentVariables; }
     @Override public Architecture adminClusterArchitecture() { return adminClusterNodeResourcesArchitecture; }
@@ -323,26 +315,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
         return this;
     }
 
-    public TestProperties setPersistenceThrottlingWsDecrementFactor(double factor) {
-        this.persistenceThrottlingWsDecrementFactor = factor;
-        return this;
-    }
-
-    public TestProperties setPersistenceThrottlingWsBackoff(double backoff) {
-        this.persistenceThrottlingWsBackoff = backoff;
-        return this;
-    }
-
-    public TestProperties setPersistenceThrottlingWindowSize(int windowSize) {
-        this.persistenceThrottlingWindowSize = windowSize;
-        return this;
-    }
-
-    public TestProperties setPersistenceThrottlingWsResizeRate(double resizeRate) {
-        this.persistenceThrottlingWsResizeRate = resizeRate;
-        return this;
-    }
-
     public TestProperties setUseV8GeoPositions(boolean value) {
         this.useV8GeoPositions = value;
         return this;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/FileStorProducer.java b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/FileStorProducer.java
index ff905187969..092b94d72dc 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/FileStorProducer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/FileStorProducer.java
@@ -46,11 +46,6 @@ public class FileStorProducer implements StorFilestorConfig.Producer {
     private final ContentCluster cluster;
     private final int responseNumThreads;
     private final StorFilestorConfig.Response_sequencer_type.Enum responseSequencerType;
-    private final double persistenceThrottlingWsDecrementFactor;
-    private final double persistenceThrottlingWsBackoff;
-    private final int persistenceThrottlingWindowSize;
-    private final double persistenceThrottlingWsResizeRate;
-    private final boolean persistenceThrottlingOfMergeFeedOps;
     private final boolean useAsyncMessageHandlingOnSchedule;
 
     private static StorFilestorConfig.Response_sequencer_type.Enum convertResponseSequencerType(String sequencerType) {
@@ -66,11 +61,6 @@ public class FileStorProducer implements StorFilestorConfig.Producer {
         this.cluster = parent;
         this.responseNumThreads = featureFlags.defaultNumResponseThreads();
         this.responseSequencerType = convertResponseSequencerType(featureFlags.responseSequencerType());
-        this.persistenceThrottlingWsDecrementFactor = featureFlags.persistenceThrottlingWsDecrementFactor();
-        this.persistenceThrottlingWsBackoff = featureFlags.persistenceThrottlingWsBackoff();
-        this.persistenceThrottlingWindowSize = featureFlags.persistenceThrottlingWindowSize();
-        this.persistenceThrottlingWsResizeRate = featureFlags.persistenceThrottlingWsResizeRate();
-        this.persistenceThrottlingOfMergeFeedOps = featureFlags.persistenceThrottlingOfMergeFeedOps();
         this.useAsyncMessageHandlingOnSchedule = featureFlags.useAsyncMessageHandlingOnSchedule();
     }
 
@@ -84,14 +74,6 @@ public class FileStorProducer implements StorFilestorConfig.Producer {
         builder.response_sequencer_type(responseSequencerType);
         builder.use_async_message_handling_on_schedule(useAsyncMessageHandlingOnSchedule);
         var throttleBuilder = new StorFilestorConfig.Async_operation_throttler.Builder();
-        throttleBuilder.window_size_decrement_factor(persistenceThrottlingWsDecrementFactor);
-        throttleBuilder.window_size_backoff(persistenceThrottlingWsBackoff);
-        if (persistenceThrottlingWindowSize > 0) {
-            throttleBuilder.min_window_size(persistenceThrottlingWindowSize);
-            throttleBuilder.max_window_size(persistenceThrottlingWindowSize);
-        }
-        throttleBuilder.resize_rate(persistenceThrottlingWsResizeRate);
-        throttleBuilder.throttle_individual_merge_feed_ops(persistenceThrottlingOfMergeFeedOps);
         builder.async_operation_throttler(throttleBuilder);
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
index 2a9cb2733fb..48cee3fd397 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
@@ -327,21 +327,6 @@ public class StorageClusterTest {
     }
 
     @Test
-    void persistence_dynamic_throttling_parameters_can_be_set_through_feature_flags() {
-        var config = filestorConfigFromProducer(simpleCluster(new TestProperties()
-                .setPersistenceThrottlingWsDecrementFactor(1.5)
-                .setPersistenceThrottlingWsBackoff(0.8)
-                .setPersistenceThrottlingWindowSize(42)
-                .setPersistenceThrottlingWsResizeRate(2.5)));
-        assertEquals(1.5, config.async_operation_throttler().window_size_decrement_factor(), 0.0001);
-        assertEquals(0.8, config.async_operation_throttler().window_size_backoff(), 0.0001);
-        // If window size is set, min and max are locked to the same value
-        assertEquals(42, config.async_operation_throttler().min_window_size());
-        assertEquals(42, config.async_operation_throttler().max_window_size());
-        assertEquals(2.5, config.async_operation_throttler().resize_rate(), 0.0001);
-    }
-
-    @Test
     void integrity_checker_explicitly_disabled_when_not_running_with_vds_provider() {
         StorIntegritycheckerConfig.Builder builder = new StorIntegritycheckerConfig.Builder();
         parse(cluster("bees", "")).getConfig(builder);