Merge pull request #8286 from vespa-engine/balder/control-amortizationcount

Add a supported way of controling the obscure 'amortizecount'. MERGEOK

4 files changed, 12 insertions, 4 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 eec9151ce0c..35e06daf3fe 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
@@ -1,15 +1,12 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.builder.xml.dom;
 
-import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.text.XML;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.search.Tuning;
 import org.w3c.dom.Element;
 
-import java.util.logging.Level;
-
 /**
  * Builder for the tuning config for a search cluster.
  *
@@ -168,6 +165,8 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui
         for (Element e : XML.getChildren(spec)) {
             if (equals("initialdocumentcount", e)) {
                 sn.resizing.initialDocumentCount = asInt(e);
+            } else if (equals("amortizecount", e)) {
+                sn.resizing.amortizeCount = asInt(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 e840b47e054..2571381167e 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
@@ -149,6 +149,7 @@ public class Tuning extends AbstractConfigProducer implements PartitionsConfig.P
 
         public static class Resizing implements ProtonConfig.Producer {
             public Integer initialDocumentCount = null;
+            public Integer amortizeCount = null;
 
             @Override
             public void getConfig(ProtonConfig.Builder builder) {
@@ -158,6 +159,11 @@ public class Tuning extends AbstractConfigProducer implements PartitionsConfig.P
                         db.allocation.initialnumdocs(initialDocumentCount);
                     }
                 }
+                if (amortizeCount !=null) {
+                    for (ProtonConfig.Documentdb.Builder db : builder.documentdb) {
+                        db.allocation.amortizecount(amortizeCount);
+                    }
+                }
             }
 
         }
diff --git a/config-model/src/main/resources/schema/content.rnc b/config-model/src/main/resources/schema/content.rnc
index dfbcfaaac61..aced5aeac1a 100644
--- a/config-model/src/main/resources/schema/content.rnc
+++ b/config-model/src/main/resources/schema/content.rnc
@@ -311,7 +311,8 @@ Tuning = element tuning {
          }?
       }? &
       element resizing {
-         element initialdocumentcount { xsd:nonNegativeInteger }?
+         element initialdocumentcount { xsd:nonNegativeInteger }? &
+         element amortizecount { xsd:nonNegativeInteger }?
       }? &
       element index {
          element io {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilderTest.java
index 14c36ef271d..f8ddae575b5 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilderTest.java
@@ -134,8 +134,10 @@ public class DomSearchTuningBuilderTest extends DomBuilderTest {
     public void requireThatWeCanParseResizingTag() {
         Tuning t = createTuning(parseXml("<resizing>",
                 "<initialdocumentcount>128</initialdocumentcount>",
+                "<amortizecount>13</amortizecount>",
                 "</resizing>"));
         assertEquals(128, t.searchNode.resizing.initialDocumentCount.intValue());
+        assertEquals(13, t.searchNode.resizing.amortizeCount.intValue());
         String cfg = getProtonCfg(t);
         assertThat(cfg, containsString("grow.initial 128"));
     }