diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-10-06 15:57:22 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-10-06 15:57:22 +0200 |
commit | e9d2e1c3c174bb733f4420bd5f0f72311111e092 (patch) | |
tree | e403bdef2723e0dc36b895e89ff3577f599f3570 /config-model | |
parent | 3cbbac35a188b578f1360ede59de6175b5d43665 (diff) |
GC persistence-throttling-of-merge-feed-ops flag which has long had sane default.
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java | 7 | ||||
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java | 4 |
2 files changed, 1 insertions, 10 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 d6de407f1a6..e4234581cc1 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 @@ -71,7 +71,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea private double persistenceThrottlingWsBackoff = 0.95; private int persistenceThrottlingWindowSize = -1; private double persistenceThrottlingWsResizeRate = 3.0; - private boolean persistenceThrottlingOfMergeFeedOps = true; private boolean useV8GeoPositions = true; private List<String> environmentVariables = List.of(); private boolean loadCodeAsHugePages = false; @@ -130,7 +129,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea @Override public double persistenceThrottlingWsBackoff() { return persistenceThrottlingWsBackoff; } @Override public int persistenceThrottlingWindowSize() { return persistenceThrottlingWindowSize; } @Override public double persistenceThrottlingWsResizeRate() { return persistenceThrottlingWsResizeRate; } - @Override public boolean persistenceThrottlingOfMergeFeedOps() { return persistenceThrottlingOfMergeFeedOps; } @Override public boolean useV8GeoPositions() { return useV8GeoPositions; } @Override public List<String> environmentVariables() { return environmentVariables; } @Override public Architecture adminClusterArchitecture() { return adminClusterNodeResourcesArchitecture; } @@ -345,11 +343,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea return this; } - public TestProperties setPersistenceThrottlingOfMergeFeedOps(boolean throttleOps) { - this.persistenceThrottlingOfMergeFeedOps = throttleOps; - return this; - } - public TestProperties setUseV8GeoPositions(boolean value) { this.useV8GeoPositions = value; return this; 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 bde3be562f7..2a9cb2733fb 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 @@ -332,15 +332,13 @@ public class StorageClusterTest { .setPersistenceThrottlingWsDecrementFactor(1.5) .setPersistenceThrottlingWsBackoff(0.8) .setPersistenceThrottlingWindowSize(42) - .setPersistenceThrottlingWsResizeRate(2.5) - .setPersistenceThrottlingOfMergeFeedOps(false))); + .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); - assertFalse(config.async_operation_throttler().throttle_individual_merge_feed_ops()); } @Test |