Merge pull request #27543 from vespa-engine/balder/expose-niceness-tuning

Expose tuning of niceness.

4 files changed, 13 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java
index 64592e75c41..a0a4151daf5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java
@@ -298,6 +298,8 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui
         for (Element e : XML.getChildren(spec)) {
             if (equals("concurrency", e)) {
                 sn.feeding.concurrency = asDouble(e);
+            } else if (equals("niceness", e)) {
+                sn.feeding.niceness = asDouble(e);
             }
         }
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java b/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java
index 93e3a6e7a19..83eccc8697c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java
@@ -371,12 +371,16 @@ public class Tuning extends AnyConfigProducer implements ProtonConfig.Producer {
 
         public static class Feeding implements ProtonConfig.Producer {
             public Double concurrency = null;
+            public Double niceness = null;
 
             @Override
             public void getConfig(ProtonConfig.Builder builder) {
                 if (concurrency != null) {
                     builder.feeding.concurrency(concurrency);
                 }
+                if (niceness != null) {
+                    builder.feeding.niceness(niceness);
+                }
             }
         }
 
diff --git a/config-model/src/main/resources/schema/content.rnc b/config-model/src/main/resources/schema/content.rnc
index 5833b575a74..a73236454c6 100644
--- a/config-model/src/main/resources/schema/content.rnc
+++ b/config-model/src/main/resources/schema/content.rnc
@@ -370,7 +370,8 @@ Tuning = element tuning {
          element threads { xsd:nonNegativeInteger }?
       }? &
       element feeding {
-         element concurrency { xsd:double { minInclusive = "0.0" maxInclusive = "1.0" } }?
+         element concurrency { xsd:double { minInclusive = "0.0" maxInclusive = "1.0" } }? &
+         element niceness { xsd:double { minInclusive = "0.0" maxInclusive = "1.0" } }?
       }? &
       element removed-db {
          element prune {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSchemaTuningBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSchemaTuningBuilderTest.java
index e3e9fc1a232..db15d7e0a78 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSchemaTuningBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSchemaTuningBuilderTest.java
@@ -285,9 +285,13 @@ public class DomSchemaTuningBuilderTest extends DomBuilderTest {
     void requireThatWeCanParseFeedingTag() {
         Tuning t = createTuning(parseXml("<feeding>",
                 "<concurrency>0.7</concurrency>",
+                "<niceness>0.3</niceness>",
                 "</feeding>"));
         assertEquals(0.7, t.searchNode.feeding.concurrency, DELTA);
-        assertEquals(getProtonCfg(t).feeding().concurrency(), 0.7, DELTA);
+        assertEquals(0.3, t.searchNode.feeding.niceness, DELTA);
+        var cfg = getProtonCfg(t);
+        assertEquals(cfg.feeding().concurrency(), 0.7, DELTA);
+        assertEquals(cfg.feeding().niceness(), 0.3, DELTA);
     }
 
 }