Merge pull request #3670 from vespa-engine/balder/remove-summary-maxdiskbloatfactor

Remove maxdiskbloatfactor.

3 files changed, 3 insertions, 7 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 4e66368ef73..ba89169fc4c 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
@@ -245,7 +245,9 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui
             if (equals("maxfilesize", e)) {
                 s.logStore.maxFileSize = asLong(e);
             } else if (equals("maxdiskbloatfactor", e)) {
-                s.logStore.maxDiskBloatFactor = asDouble(e);
+                parent.deployLogger().log(Level.WARNING,
+                        "Element 'maxdiskbloatfactor is deprecated and ignored." +
+                        " The min value from flush.memory.xxx.diskbloatfactor is used instead");
             } else if (equals("minfilesizefactor", e)) {
                 s.logStore.minFileSizeFactor = asDouble(e);
             } else if (equals("numthreads", 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 7c40acd91ee..17af4030cb6 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
@@ -282,14 +282,12 @@ public class Tuning extends AbstractConfigProducer implements PartitionsConfig.P
 
                 public static class LogStore {
                     public Long maxFileSize = null;
-                    public Double maxDiskBloatFactor = null;
                     public Integer numThreads = null;
                     public Component chunk = null;
                     public Double minFileSizeFactor = null;
 
                     public void getConfig(ProtonConfig.Summary.Log.Builder log) {
                         if (maxFileSize!=null) log.maxfilesize(maxFileSize);
-                        if (maxDiskBloatFactor!=null) log.maxdiskbloatfactor(maxDiskBloatFactor);
                         if (minFileSizeFactor!=null) log.minfilesizefactor(minFileSizeFactor);
                         if (numThreads != null) log.numthreads(numThreads);
                         if (chunk != null) {
@@ -304,7 +302,6 @@ public class Tuning extends AbstractConfigProducer implements PartitionsConfig.P
                 public void getConfig(ProtonConfig.Summary.Builder builder) {
                     if (cache != null) {
                         cache.getConfig(builder.cache);
-
                     }
                     if (logStore != null) {
                         logStore.getConfig(builder.log);
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 f421cbd84db..613827d2cf1 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
@@ -184,7 +184,6 @@ public class DomSearchTuningBuilderTest extends DomBuilderTest {
                 "</cache>",
                 "<logstore>",
                 "<maxfilesize>512</maxfilesize>",
-                "<maxdiskbloatfactor>1.4</maxdiskbloatfactor>",
                 "<minfilesizefactor>0.3</minfilesizefactor>",
                 "<numthreads>7</numthreads>",
                 "<chunk>",
@@ -204,7 +203,6 @@ public class DomSearchTuningBuilderTest extends DomBuilderTest {
                 t.searchNode.summary.store.cache.compression.type);
         assertEquals(3, t.searchNode.summary.store.cache.compression.level.intValue());
         assertEquals(512, t.searchNode.summary.store.logStore.maxFileSize.longValue());
-        assertEquals(1.4, t.searchNode.summary.store.logStore.maxDiskBloatFactor, DELTA);
         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());
@@ -219,7 +217,6 @@ public class DomSearchTuningBuilderTest extends DomBuilderTest {
         assertThat(cfg, containsString("summary.cache.compression.type NONE"));
         assertThat(cfg, containsString("summary.cache.compression.level 3"));
         assertThat(cfg, containsString("summary.log.maxfilesize 512"));
-        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.compression.type LZ4"));