Warn and ignore maxentries from services.xml too.

4 files changed, 11 insertions, 21 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 4dc42f1fa15..0a51993b730 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
@@ -71,7 +71,7 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui
             } else if (equals("attribute", e)) {
                 handleAttribute(e, t.searchNode);
             } else if (equals("summary", e)) {
-                handleSummary(e, t.searchNode);
+                handleSummary(parent, e, t.searchNode);
             } else if (equals("initialize", e)) {
                 handleInitialize(e, t.searchNode);
             }
@@ -184,7 +184,7 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui
         }
     }
 
-    private void handleSummary(Element spec, Tuning.SearchNode sn) {
+    private void handleSummary(AbstractConfigProducer parent, Element spec, Tuning.SearchNode sn) {
         sn.summary = new Tuning.SearchNode.Summary();
         for (Element e : XML.getChildren(spec)) {
             if (equals("io", e)) {
@@ -197,29 +197,29 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui
                     }
                 }
             } else if (equals("store", e)) {
-                handleSummaryStore(e, sn.summary);
+                handleSummaryStore(parent, e, sn.summary);
             }
         }
     }
 
-    private void handleSummaryStore(Element spec, Tuning.SearchNode.Summary s) {
+    private void handleSummaryStore(AbstractConfigProducer parent, Element spec, Tuning.SearchNode.Summary s) {
         s.store = new Tuning.SearchNode.Summary.Store();
         for (Element e : XML.getChildren(spec)) {
             if (equals("cache", e)) {
                 s.store.cache = new Tuning.SearchNode.Summary.Store.Component();
-                handleSummaryStoreComponent(e, s.store.cache);
+                handleSummaryStoreComponent(parent, e, s.store.cache);
             } else if (equals("logstore", e)) {
-                handleSummaryLogStore(e, s.store);
+                handleSummaryLogStore(parent, e, s.store);
             }
         }
     }
 
-    private void handleSummaryStoreComponent(Element spec, Tuning.SearchNode.Summary.Store.Component c) {
+    private void handleSummaryStoreComponent(AbstractConfigProducer parent, Element spec, Tuning.SearchNode.Summary.Store.Component c) {
          for (Element e : XML.getChildren(spec)) {
             if (equals("maxsize", e)) {
                 c.maxSize = asLong(e);
             } else if (equals("maxentries", e)) {
-                c.maxEntries = asLong(e);
+                parent.deployLogger().log(Level.WARNING, "Element 'maxentries is deprecated and ignored. Will only limit by size.");
             } else if (equals("initialentries", e)) {
                 c.initialEntries = asLong(e);
             } else if (equals("compression", e)) {
@@ -239,7 +239,7 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui
         }
     }
 
-    private void handleSummaryLogStore(Element spec, Tuning.SearchNode.Summary.Store s) {
+    private void handleSummaryLogStore(AbstractConfigProducer parent, Element spec, Tuning.SearchNode.Summary.Store s) {
         s.logStore = new Tuning.SearchNode.Summary.Store.LogStore();
         for (Element e : XML.getChildren(spec)) {
             if (equals("maxfilesize", e)) {
@@ -252,7 +252,7 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui
                 s.logStore.numThreads = asInt(e);
             } else if (equals("chunk", e)) {
                 s.logStore.chunk = new Tuning.SearchNode.Summary.Store.Component(true);
-                handleSummaryStoreComponent(e, s.logStore.chunk);
+                handleSummaryStoreComponent(parent, e, s.logStore.chunk);
             }
         }
     }
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 de512146b0c..c1650b6c3e0 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
@@ -251,7 +251,6 @@ public class Tuning extends AbstractConfigProducer implements PartitionsConfig.P
 
                 public static class Component {
                     public Long maxSize = null;
-                    public Long maxEntries = null;
                     public Long initialEntries = null;
                     public Compression compression = null;
                     private final boolean outputInt;
@@ -267,11 +266,9 @@ public class Tuning extends AbstractConfigProducer implements PartitionsConfig.P
                     public void getConfig(ProtonConfig.Summary.Cache.Builder cache) {
                         if (outputInt) {
                             if (maxSize!=null) cache.maxbytes(maxSize.intValue());
-                            if (maxEntries!=null) cache.initialentries(maxEntries.intValue());
                             if (initialEntries!=null) cache.initialentries(initialEntries.intValue());
                         } else {
                             if (maxSize!=null) cache.maxbytes(maxSize);
-                            if (maxEntries!=null) cache.initialentries(maxEntries);
                             if (initialEntries!=null) cache.initialentries(initialEntries);
                         }
                         if (compression != null) {
@@ -284,7 +281,6 @@ public class Tuning extends AbstractConfigProducer implements PartitionsConfig.P
                     public void getConfig(ProtonConfig.Summary.Log.Chunk.Builder chunk) {
                         if (outputInt) {
                             if (maxSize!=null) chunk.maxbytes(maxSize.intValue());
-                            if (maxEntries!=null) chunk.maxentries(maxEntries.intValue());
                         } else {
                             throw new IllegalStateException("Fix this, chunk does not have long types");
                         }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
index 138bf21b6c6..ae1117c8e5c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
@@ -786,7 +786,6 @@ public class ContentBuilderTest extends DomBuilderTest {
                 "              <store>" +
                 "                <cache>" +
                 "                  <maxsize>8192</maxsize>" +
-                "                  <maxentries>32</maxentries>" +
                 "                  <compression>" +
                 "                    <type>lz4</type>" +
                 "                    <level>8</level>" +
@@ -816,7 +815,6 @@ public class ContentBuilderTest extends DomBuilderTest {
         List<String> serialize = ConfigInstance.serialize(new ProtonConfig(pb));
         String cfg = StringUtilities.implode(serialize.toArray(new String[serialize.size()]), "\n");
         assertThat(cfg, containsString("summary.cache.maxbytes 8192"));
-        assertThat(cfg, containsString("summary.cache.initialentries 32"));
         assertThat(cfg, containsString("summary.cache.compression.level 8"));
         assertThat(cfg, containsString("summary.cache.compression.type LZ4"));
         assertThat(cfg, containsString("summary.read.io DIRECTIO"));
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 b2f9cae26f0..2bfa5bd7875 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
@@ -176,7 +176,7 @@ public class DomSearchTuningBuilderTest extends DomBuilderTest {
                 "<store>",
                 "<cache>",
                 "<maxsize>128</maxsize>",
-                "<maxentries>64</maxentries>",
+                "<initialentries>64</initialentries>",
                 "<compression>",
                 "<type>none</type>",
                 "<level>3</level>",
@@ -189,7 +189,6 @@ public class DomSearchTuningBuilderTest extends DomBuilderTest {
                 "<numthreads>7</numthreads>",
                 "<chunk>",
                 "<maxsize>256</maxsize>",
-                "<maxentries>32</maxentries>",
                 "<compression>",
                 "<type>lz4</type>",
                 "<level>5</level>",
@@ -201,7 +200,6 @@ public class DomSearchTuningBuilderTest extends DomBuilderTest {
         assertEquals(Tuning.SearchNode.IoType.DIRECTIO, t.searchNode.summary.io.write);
         assertEquals(Tuning.SearchNode.IoType.DIRECTIO, t.searchNode.summary.io.read);
         assertEquals(128, t.searchNode.summary.store.cache.maxSize.longValue());
-        assertEquals(64, t.searchNode.summary.store.cache.maxEntries.longValue());
         assertEquals(Tuning.SearchNode.Summary.Store.Compression.Type.NONE,
                 t.searchNode.summary.store.cache.compression.type);
         assertEquals(3, t.searchNode.summary.store.cache.compression.level.intValue());
@@ -210,7 +208,6 @@ public class DomSearchTuningBuilderTest extends DomBuilderTest {
         assertEquals(0.3, t.searchNode.summary.store.logStore.minFileSizeFactor, DELTA);
         assertEquals(7, t.searchNode.summary.store.logStore.numThreads.intValue());
         assertEquals(256, t.searchNode.summary.store.logStore.chunk.maxSize.intValue());
-        assertEquals(32, t.searchNode.summary.store.logStore.chunk.maxEntries.intValue());
         assertEquals(Tuning.SearchNode.Summary.Store.Compression.Type.LZ4,
                 t.searchNode.summary.store.logStore.chunk.compression.type);
         assertEquals(5, t.searchNode.summary.store.logStore.chunk.compression.level.intValue());
@@ -225,7 +222,6 @@ public class DomSearchTuningBuilderTest extends DomBuilderTest {
         assertThat(cfg, containsString("summary.log.maxdiskbloatfactor 1.4"));
         assertThat(cfg, containsString("summary.log.minfilesizefactor 0.3"));
         assertThat(cfg, containsString("summary.log.chunk.maxbytes 256"));
-        assertThat(cfg, containsString("summary.log.chunk.maxentries 32"));
         assertThat(cfg, containsString("summary.log.chunk.compression.type LZ4"));
         assertThat(cfg, containsString("summary.log.chunk.compression.level 5"));
     }