summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeir Storli <geirstorli@yahoo.no>2018-09-28 15:00:45 +0200
committerGitHub <noreply@github.com>2018-09-28 15:00:45 +0200
commite6f46440bd697d78921379dba4f7e55ca2d85c7a (patch)
treeb74125bb35df34cbb66072db779c4c129bafd6c6
parent9842b4260ace8433f0e00a3c5052f09b623b6cdf (diff)
parent33aa7f1500eb90f1d4dc4da080db6b4333525d96 (diff)
Merge pull request #7143 from vespa-engine/toregge/stop-emitting-proton-config-for-search-io-tunning
Stop emitting proton config for search io tuning. Files are memory mapped.
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/search/Tuning.java3
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilderTest.java1
2 files changed, 0 insertions, 4 deletions
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 f29c7ade816..5581b9b87ba 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
@@ -153,9 +153,6 @@ public class Tuning extends AbstractConfigProducer implements PartitionsConfig.P
if (read != null) {
builder.indexing.read.io(ProtonConfig.Indexing.Read.Io.Enum.valueOf(read.name));
}
- if (search != null) {
- builder.search.io(ProtonConfig.Search.Io.Enum.valueOf(search.name));
- }
}
}
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 a2eccbcb583..0126c58eec5 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
@@ -152,7 +152,6 @@ public class DomSearchTuningBuilderTest extends DomBuilderTest {
String cfg = getProtonCfg(t);
assertThat(cfg, containsString("indexing.write.io DIRECTIO"));
assertThat(cfg, containsString("indexing.read.io NORMAL"));
- assertThat(cfg, containsString("search.io MMAP"));
}
@Test