Control disk-bloat-factor and compression level with feature flag.

2 files changed, 20 insertions, 1 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 a6f8d510c0d..ce4e5f0c01f 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
@@ -50,7 +50,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private boolean useAsyncMessageHandlingOnSchedule = false;
     private double feedConcurrency = 0.5;
     private boolean enableFeedBlockInDistributor = true;
-    private boolean enforceRankProfileInheritance = true;
     private int maxActivationInhibitedOutOfSyncGroups = 0;
     private List<TenantSecretStore> tenantSecretStores = Collections.emptyList();
     private String jvmOmitStackTraceInFastThrowOption;
@@ -66,6 +65,8 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private boolean containerDumpHeapOnShutdownTimeout = false;
     private double containerShutdownTimeout = 50.0;
     private int distributorMergeBusyWait = 10;
+    private int docstoreCompressionLevel = 9;
+    private double diskBloatFactor = 0.2;
 
     @Override public ModelContext.FeatureFlags featureFlags() { return this; }
     @Override public boolean multitenant() { return multitenant; }
@@ -111,7 +112,18 @@ 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 int docstoreCompressionLevel() { return docstoreCompressionLevel; }
 
+    public TestProperties docstoreCompressionLevel(int docstoreCompressionLevel) {
+        this.docstoreCompressionLevel = docstoreCompressionLevel;
+        return this;
+    }
+
+    public TestProperties diskBloatFactor(double diskBloatFactor) {
+        this.diskBloatFactor = diskBloatFactor;
+        return this;
+    }
 
     public TestProperties containerDumpHeapOnShutdownTimeout(boolean value) {
         containerDumpHeapOnShutdownTimeout = value;
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 ba4daa84fe6..51c5d85e300 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
@@ -65,6 +65,8 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
     private Optional<ResourceLimits> resourceLimits = Optional.empty();
     private final ProtonConfig.Indexing.Optimize.Enum feedSequencerType;
     private final double defaultFeedConcurrency;
+    private final double defaultDiskBloatFactor;
+    private final int defaultDocStoreCompressionLevel;
 
     /** Whether the nodes of this cluster also hosts a container cluster in a hosted system */
     private final boolean combined;
@@ -209,6 +211,8 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
         this.combined = combined;
         feedSequencerType = convertFeedSequencerType(featureFlags.feedSequencerType());
         defaultFeedConcurrency = featureFlags.feedConcurrency();
+        defaultDocStoreCompressionLevel = featureFlags.docstoreCompressionLevel();
+        defaultDiskBloatFactor = featureFlags.diskBloatFactor();
     }
 
     public void setVisibilityDelay(double delay) {
@@ -401,6 +405,9 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
         } else {
             builder.feeding.concurrency(defaultFeedConcurrency);
         }
+        builder.flush.memory.diskbloatfactor(defaultDiskBloatFactor);
+        builder.flush.memory.each.diskbloatfactor(defaultDiskBloatFactor);
+        builder.summary.log.chunk.compression.level(defaultDocStoreCompressionLevel);
 
         int numDocumentDbs = builder.documentdb.size();
         builder.initialize(new ProtonConfig.Initialize.Builder().threads(numDocumentDbs + 1));