Do not use maxage.serial anymore. Just use maxsize.

3 files changed, 9 insertions, 12 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 d18890795bc..4dc42f1fa15 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
@@ -6,6 +6,8 @@ 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.
  *
@@ -20,7 +22,7 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui
             if (equals("dispatch", e)) {
                 handleDispatch(e, tuning);
             } else if (equals("searchnode", e)) {
-                handleSearchNode(e, tuning);
+                handleSearchNode(parent, e, tuning);
             }
         }
         return tuning;
@@ -55,13 +57,13 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui
         }
     }
 
-    private void handleSearchNode(Element spec, Tuning t) {
+    private void handleSearchNode(AbstractConfigProducer parent, Element spec, Tuning t) {
         t.searchNode = new Tuning.SearchNode();
         for (Element e : XML.getChildren(spec)) {
             if (equals("requestthreads", e)) {
                handleRequestThreads(e, t.searchNode);
             } else if (equals("flushstrategy", e)) {
-                handleFlushStrategy(e, t.searchNode);
+                handleFlushStrategy(parent,e, t.searchNode);
             } else if (equals("resizing", e)) {
                 handleResizing(e, t.searchNode);
             } else if (equals("index", e)) {
@@ -90,15 +92,15 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui
         }
     }
 
-    private void handleFlushStrategy(Element spec, Tuning.SearchNode sn) {
+    private void handleFlushStrategy(AbstractConfigProducer parent, Element spec, Tuning.SearchNode sn) {
         for (Element e : XML.getChildren(spec)) {
             if (equals("native", e)) {
-                handleNativeStrategy(e, sn);
+                handleNativeStrategy(parent, e, sn);
             }
         }
     }
 
-    private void handleNativeStrategy(Element spec, Tuning.SearchNode sn) {
+    private void handleNativeStrategy(AbstractConfigProducer parent, Element spec, Tuning.SearchNode sn) {
         sn.strategy = new Tuning.SearchNode.FlushStrategy();
         Tuning.SearchNode.FlushStrategy fs = sn.strategy;
         for (Element e : XML.getChildren(spec)) {
@@ -123,7 +125,7 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui
             } else if (equals("transactionlog", e)) {
                 for (Element subElem : XML.getChildren(e)) {
                     if (equals("maxentries", subElem)) {
-                        fs.transactionLogMaxEntries = asLong(subElem);
+                        parent.deployLogger().log(Level.WARNING, "Element 'transactionlog.maxentries is deprecated and ignored in 'native' flush strategy. Use 'transactionlog.maxsize' to limit by size.");
                     } else if (equals("maxsize", subElem)) {
                         fs.transactionLogMaxSize = asLong(subElem);
                     }
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 5cf9557acbd..de512146b0c 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
@@ -97,7 +97,6 @@ public class Tuning extends AbstractConfigProducer implements PartitionsConfig.P
             public Long componentMaxMemoryGain = null;
             public Double componentDiskBloatFactor = null;
             public Double componentMaxage = null;
-            public Long transactionLogMaxEntries = null;
             public Long transactionLogMaxSize = null;
             public Double conservativeMemoryLimitFactor = null;
             public Double conservativeDiskLimitFactor = null;
@@ -118,7 +117,6 @@ public class Tuning extends AbstractConfigProducer implements PartitionsConfig.P
 
                 ProtonConfig.Flush.Memory.Maxage.Builder maxageBuilder = new ProtonConfig.Flush.Memory.Maxage.Builder();
                 if (componentMaxage != null) maxageBuilder.time(componentMaxage);
-                if (transactionLogMaxEntries != null) maxageBuilder.serial(transactionLogMaxEntries);
                 memoryBuilder.maxage(maxageBuilder);
 
                 ProtonConfig.Flush.Memory.Conservative.Builder conservativeBuilder = new ProtonConfig.Flush.Memory.Conservative.Builder();
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 805d775f492..b2f9cae26f0 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
@@ -104,7 +104,6 @@ public class DomSearchTuningBuilderTest extends DomBuilderTest {
                 "<maxage>300</maxage>",
                 "</component>",
                 "<transactionlog>",
-                "<maxentries>200</maxentries>",
                 "<maxsize>1024</maxsize>",
                 "</transactionlog>",
                 "<conservative>",
@@ -117,7 +116,6 @@ public class DomSearchTuningBuilderTest extends DomBuilderTest {
         assertEquals(600, t.searchNode.strategy.componentMaxMemoryGain.longValue());
         assertEquals(5.4, t.searchNode.strategy.componentDiskBloatFactor.doubleValue(), DELTA);
         assertEquals(300, t.searchNode.strategy.componentMaxage.doubleValue(), DELTA);
-        assertEquals(200, t.searchNode.strategy.transactionLogMaxEntries.longValue());
         assertEquals(1024, t.searchNode.strategy.transactionLogMaxSize.longValue());
         assertEquals(0.6, t.searchNode.strategy.conservativeMemoryLimitFactor.doubleValue(), DELTA);
         assertEquals(0.7, t.searchNode.strategy.conservativeDiskLimitFactor.doubleValue(), DELTA);
@@ -127,7 +125,6 @@ public class DomSearchTuningBuilderTest extends DomBuilderTest {
         assertThat(cfg, containsString("flush.memory.each.maxmemory 600"));
         assertThat(cfg, containsString("flush.memory.each.diskbloatfactor 5.4"));
         assertThat(cfg, containsString("flush.memory.maxage.time 300"));
-        assertThat(cfg, containsString("flush.memory.maxage.serial 200"));
         assertThat(cfg, containsString("flush.memory.maxtlssize 1024"));
         assertThat(cfg, containsString("flush.memory.conservative.memorylimitfactor 0.6"));
         assertThat(cfg, containsString("flush.memory.conservative.disklimitfactor 0.7"));