diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-02-02 18:33:05 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-02-02 18:33:05 +0100 |
| commit | 5c0e13b0bd89d403b0a603dd4fe6f676a8bc08b8 (patch) | |
| tree | c3446277d587d3c1773410e7870832f5256d4b94 /searchcore | |
| parent | a229dd6d865c8652df65429c5682ce166bfb51f9 (diff) | |
Ignore maxentries.
Diffstat (limited to 'searchcore')
| -rw-r--r-- | searchcore/src/vespa/searchcore/config/proton.def | 5 | ||||
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def index e59f9569da4..caf5dd92260 100644 --- a/searchcore/src/vespa/searchcore/config/proton.def +++ b/searchcore/src/vespa/searchcore/config/proton.def @@ -79,6 +79,7 @@ flush.memory.each.diskbloatfactor double default=0.2 flush.memory.maxage.time double default=86400.0 ## Max diff in serial number allowed before that takes precedence. +## TODO Deprecated and ignored. Remove soon. flush.memory.maxage.serial long default=1000000 ## When resource limit for memory is reached we choose a conservative mode for the flush strategy. @@ -232,6 +233,7 @@ summary.log.chunk.compression.level int default=9 restart summary.log.chunk.maxbytes int default=65536 restart ## Max number of documents in each chunk. +## TODO Deprecated and ignored. Remove soon. summary.log.chunk.maxentries int default=256 restart ## Skip crc32 check on read. @@ -244,6 +246,7 @@ summary.log.compact2activefile bool default=false restart summary.log.maxfilesize long default=1000000000 restart ## Max number of removes per summary file. +## TODO Deprecated and ignored. Remove soon. summary.log.maxentriesperfile long default=20000000 restart ## Max disk bloat factor. This will trigger compacting. @@ -407,4 +410,4 @@ hwinfo.disk.samplewritesize long default = 1073741824 hwinfo.disk.slowwritespeedlimit double default = 100.0 ## Adjustment to resource limit when determining if maintenance jobs can run. -maintenancejobs.resourcelimitfactor double default = 1.05
\ No newline at end of file +maintenancejobs.resourcelimitfactor double default = 1.05 diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp index 196a5081769..399811cc4b3 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp @@ -148,7 +148,6 @@ SummaryManager::SummaryManager(vespalib::ThreadExecutor & executor, log.minfilesizefactor, log.numthreads, log.compact2activefile, deriveCompression(log.compact.compression), fileConfig); logConfig.disableCrcOnRead(chunk.skipcrconread); - logConfig.setMaxEntriesPerFile(log.maxentriesperfile); _docStore.reset(new LogDocumentStore(executor, baseDir, search::LogDocumentStore::Config(config, logConfig), growStrategy, tuneFileSummary, fileHeaderContext, tlSyncer, |