diff options
author | Geir Storli <geirst@oath.com> | 2018-09-26 12:44:56 +0000 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:22 +0100 |
commit | 3b1cb82650c2d9a4782557aec7499b5908d0cd23 (patch) | |
tree | 4c0fc2abcfda571b783c6ed03105eb1a4735100f /config-model | |
parent | e6899fbbefb64f3ab0a57e8502af3287e4d92f17 (diff) |
Remove deprecated proton tuning settings.
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java | 10 | ||||
-rw-r--r-- | config-model/src/main/resources/schema/content.rnc | 4 |
2 files changed, 1 insertions, 13 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 4cf6c8995e3..067d653ea40 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 @@ -128,9 +128,7 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui } } else if (equals("transactionlog", e)) { for (Element subElem : XML.getChildren(e)) { - if (equals("maxentries", subElem)) { - 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)) { + if (equals("maxsize", subElem)) { fs.transactionLogMaxSize = asLong(subElem); } } @@ -224,8 +222,6 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui c.maxSize = asLong(e); } else if (equals("maxsize-percent", e)) { c.maxSizePercent = asDouble(e); - } else if (equals("maxentries", e)) { - 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)) { @@ -250,10 +246,6 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui for (Element e : XML.getChildren(spec)) { if (equals("maxfilesize", e)) { s.logStore.maxFileSize = asLong(e); - } else if (equals("maxdiskbloatfactor", e)) { - 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("chunk", e)) { diff --git a/config-model/src/main/resources/schema/content.rnc b/config-model/src/main/resources/schema/content.rnc index c0313cd50ef..ae2af6618d7 100644 --- a/config-model/src/main/resources/schema/content.rnc +++ b/config-model/src/main/resources/schema/content.rnc @@ -302,7 +302,6 @@ Tuning = element tuning { element maxage { xsd:nonNegativeInteger }? }? & element transactionlog { - element maxentries { xsd:nonNegativeInteger }? & element maxsize { xsd:nonNegativeInteger }? }? & element conservative { @@ -336,16 +335,13 @@ Tuning = element tuning { element maxsize { xsd:nonNegativeInteger }? & element maxsize-percent { xsd:double { minInclusive = "0.0" maxInclusive = "50.0" } }? & element initialentries { xsd:nonNegativeInteger }? & - element maxentries { xsd:nonNegativeInteger }? & TuningCompression? }? & element logstore { element maxfilesize { xsd:nonNegativeInteger }? & - element maxdiskbloatfactor { xsd:double { minInclusive = "0.0" } }? & element minfilesizefactor { xsd:double { minInclusive = "0.10" maxInclusive = "1.0" } }? & element chunk { element maxsize { xsd:nonNegativeInteger }? & - element maxentries { xsd:nonNegativeInteger }? & TuningCompression? }? }? |