Merge pull request #20781 from vespa-engine/balder/gc-featureflag-control-of-disk-bloat-factor

GC featureflag control of disk bloat factor

3 files changed, 4 insertions, 18 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 730785b35fc..039eecf003a 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
@@ -68,7 +68,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private double containerShutdownTimeout = 50.0;
     private int distributorMergeBusyWait = 10;
     private int maxUnCommittedMemory = 123456;
-    private double diskBloatFactor = 0.25;
     private boolean distributorEnhancedMaintenanceScheduling = false;
     private boolean asyncApplyBucketDiff = false;
     private boolean unorderedMergeChaining = false;
@@ -123,7 +122,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     @Override public double containerShutdownTimeout() { return containerShutdownTimeout; }
     @Override public boolean containerDumpHeapOnShutdownTimeout() { return containerDumpHeapOnShutdownTimeout; }
     @Override public int distributorMergeBusyWait() { return distributorMergeBusyWait; }
-    @Override public double diskBloatFactor() { return diskBloatFactor; }
     @Override public boolean distributorEnhancedMaintenanceScheduling() { return distributorEnhancedMaintenanceScheduling; }
     @Override public int maxUnCommittedMemory() { return maxUnCommittedMemory; }
     @Override public boolean asyncApplyBucketDiff() { return asyncApplyBucketDiff; }
@@ -138,11 +136,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
         return this;
     }
 
-    public TestProperties diskBloatFactor(double diskBloatFactor) {
-        this.diskBloatFactor = diskBloatFactor;
-        return this;
-    }
-
     public TestProperties containerDumpHeapOnShutdownTimeout(boolean value) {
         containerDumpHeapOnShutdownTimeout = value;
         return this;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
index f7ba2fb2fe3..cadba086e36 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
@@ -44,6 +44,7 @@ import static java.util.stream.Collectors.toList;
 public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster> implements ProtonConfig.Producer, DispatchConfig.Producer {
 
     private static final int DEFAULT_DOC_STORE_COMPRESSION_LEVEL = 3;
+    private static final double DEFAULT_DISK_BLOAT = 0.25;
 
     private final boolean flushOnShutdown;
     private final Boolean syncTransactionLog;
@@ -70,7 +71,6 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
     private final int feedMasterTaskLimit;
     private final ProtonConfig.Feeding.Shared_field_writer_executor.Enum sharedFieldWriterExecutor;
     private final double defaultFeedConcurrency;
-    private final double defaultDiskBloatFactor;
     private final boolean forwardIssuesToQrs;
     private final int defaultMaxCompactBuffers;
 
@@ -224,7 +224,6 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
         this.feedMasterTaskLimit = featureFlags.feedMasterTaskLimit();
         this.sharedFieldWriterExecutor = convertSharedFieldWriterExecutor(featureFlags.sharedFieldWriterExecutor());
         this.defaultFeedConcurrency = featureFlags.feedConcurrency();
-        this.defaultDiskBloatFactor = featureFlags.diskBloatFactor();
         this.forwardIssuesToQrs = featureFlags.forwardIssuesAsErrors();
         this.defaultMaxCompactBuffers = featureFlags.maxCompactBuffers();
     }
@@ -423,8 +422,8 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
         } else {
             builder.feeding.concurrency(defaultFeedConcurrency);
         }
-        builder.flush.memory.diskbloatfactor(defaultDiskBloatFactor);
-        builder.flush.memory.each.diskbloatfactor(defaultDiskBloatFactor);
+        builder.flush.memory.diskbloatfactor(DEFAULT_DISK_BLOAT);
+        builder.flush.memory.each.diskbloatfactor(DEFAULT_DISK_BLOAT);
         builder.summary.log.chunk.compression.level(DEFAULT_DOC_STORE_COMPRESSION_LEVEL);
         builder.summary.log.compact.compression.level(DEFAULT_DOC_STORE_COMPRESSION_LEVEL);
         builder.forward_issues(forwardIssuesToQrs);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSchemaClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSchemaClusterTest.java
index 97e097fbe24..68e722f45d3 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSchemaClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentSchemaClusterTest.java
@@ -268,15 +268,9 @@ public class ContentSchemaClusterTest {
     }
 
     @Test
-    public void verifyControlOfDiskBloatFactor() throws Exception {
+    public void verifyDefaultDiskBloatFactor() throws Exception {
         var defaultCfg = getProtonConfig(createCluster(new ContentClusterBuilder().getXml()));
         assertEquals(0.25, defaultCfg.flush().memory().diskbloatfactor(), EPSILON);
         assertEquals(0.25, defaultCfg.flush().memory().each().diskbloatfactor(), EPSILON);
-
-        var controlledCfg = getProtonConfig(createCluster(new ContentClusterBuilder().getXml(),
-                new DeployState.Builder().properties(new TestProperties().diskBloatFactor(0.31))
-        ));
-        assertEquals(0.31, controlledCfg.flush().memory().diskbloatfactor(), EPSILON);
-        assertEquals(0.31, controlledCfg.flush().memory().each().diskbloatfactor(), EPSILON);
     }
 }