diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-07-17 18:43:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 18:43:14 +0200 |
| commit | 15761e6dadc03cc8d349aec73e0bd27366ea1bff (patch) | |
| tree | b67888fb95dad333fa4bc35658fb9e2f9fbfadc7 | |
| parent | a22dbb93b39d20f52add81941ec1df9962d54b30 (diff) | |
| parent | 573bf2c3fb5734d9d4b6a8ec1b7d144d3f27a253 (diff) | |
Merge pull request #6412 from vespa-engine/revert-6398-balder/default-summary-read-directio
Revert "As we changed to add a 5% summary cache some time ago, we should also…"
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java | 2 | ||||
| -rw-r--r-- | searchcore/src/vespa/searchcore/config/proton.def | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java index d1fede3121c..3019b35cd2e 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java @@ -83,7 +83,7 @@ public class NodeFlavorTuningTest { @Test public void require_that_summary_read_io_is_set_based_on_disk() { assertSummaryReadIo(ProtonConfig.Summary.Read.Io.DIRECTIO, true); - assertSummaryReadIo(ProtonConfig.Summary.Read.Io.DIRECTIO, false); + assertSummaryReadIo(ProtonConfig.Summary.Read.Io.MMAP, false); } @Test diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def index ca690aefa92..7578066d93a 100644 --- a/searchcore/src/vespa/searchcore/config/proton.def +++ b/searchcore/src/vespa/searchcore/config/proton.def @@ -292,7 +292,7 @@ summary.write.io enum {NORMAL, OSYNC, DIRECTIO} default=DIRECTIO ## Control io options during read of stored documents. ## All summary.read options will take effect immediately on new files written. ## On old files it will take effect either upon compact or on restart. -summary.read.io enum {NORMAL, DIRECTIO, MMAP } default=DIRECTIO restart +summary.read.io enum {NORMAL, DIRECTIO, MMAP } default=MMAP restart ## Multiple optional options for use with mmap summary.read.mmap.options[] enum {MLOCK, POPULATE, HUGETLB} restart |