Add feature flag control over defaultvalue for feed niceness.

3 files changed, 28 insertions, 0 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 e78343b5db0..3da85a83119 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,6 +50,7 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private Quota quota = Quota.unlimited();
     private boolean useAsyncMessageHandlingOnSchedule = false;
     private double feedConcurrency = 0.5;
+    private double feedNiceness = 0.0;
     private int maxActivationInhibitedOutOfSyncGroups = 0;
     private List<TenantSecretStore> tenantSecretStores = Collections.emptyList();
     private String jvmOmitStackTraceInFastThrowOption;
@@ -106,6 +107,7 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     @Override public Quota quota() { return quota; }
     @Override public boolean useAsyncMessageHandlingOnSchedule() { return useAsyncMessageHandlingOnSchedule; }
     @Override public double feedConcurrency() { return feedConcurrency; }
+    @Override public double feedNiceness() { return feedNiceness; }
     @Override public int maxActivationInhibitedOutOfSyncGroups() { return maxActivationInhibitedOutOfSyncGroups; }
     @Override public List<TenantSecretStore> tenantSecretStores() { return tenantSecretStores; }
     @Override public String jvmOmitStackTraceInFastThrowOption(ClusterSpec.Type type) { return jvmOmitStackTraceInFastThrowOption; }
@@ -164,6 +166,11 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
         return this;
     }
 
+    public TestProperties setFeedNiceness(double feedNiceness) {
+        this.feedNiceness = feedNiceness;
+        return this;
+    }
+
     public TestProperties setAsyncMessageHandlingOnSchedule(boolean value) {
         useAsyncMessageHandlingOnSchedule = 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 379115ab3ca..ff39aa0903c 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
@@ -67,6 +67,7 @@ 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 defaultFeedNiceness;
     private final boolean forwardIssuesToQrs;
     private final int defaultMaxCompactBuffers;
 
@@ -213,6 +214,7 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
         this.fractionOfMemoryReserved = fractionOfMemoryReserved;
         this.feedSequencerType = convertFeedSequencerType(featureFlags.feedSequencerType());
         this.defaultFeedConcurrency = featureFlags.feedConcurrency();
+        this.defaultFeedNiceness = featureFlags.feedNiceness();
         this.forwardIssuesToQrs = featureFlags.forwardIssuesAsErrors();
         this.defaultMaxCompactBuffers = featureFlags.maxCompactBuffers();
     }
@@ -399,6 +401,7 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
         } else {
             builder.feeding.concurrency(defaultFeedConcurrency);
         }
+        builder.feeding.niceness(defaultFeedNiceness);
         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);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java
index b60b4545869..a3c57dae2de 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java
@@ -100,6 +100,24 @@ public class DocumentDatabaseTestCase {
         assertEquals(expectedConcurrency, proton.feeding().concurrency(), SMALL);
     }
 
+    private void verifyFeedNiceness(List<DocType> nameAndModes, Double expectedNiceness, Double featureFlagNiceness) {
+        TestProperties properties = new TestProperties();
+        if (featureFlagNiceness != null) {
+            properties.setFeedNiceness(featureFlagNiceness);
+        }
+        var tester = new SchemaTester();
+        VespaModel model = tester.createModel(nameAndModes, "", new DeployState.Builder().properties(properties));
+        ContentSearchCluster contentSearchCluster = model.getContentClusters().get("test").getSearch();
+        ProtonConfig proton = tester.getProtonConfig(contentSearchCluster);
+        assertEquals(expectedNiceness, proton.feeding().niceness(), SMALL);
+    }
+
+    @Test
+    public void requireFeedNicenessIsReflected() {
+        verifyFeedNiceness(Arrays.asList(DocType.create("a", "index")), 0.0, null);
+        verifyFeedNiceness(Arrays.asList(DocType.create("a", "index")), 0.32, 0.32);
+    }
+
     @Test
     public void requireThatModeIsSet() {
         var tester = new SchemaTester();