diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-08 18:17:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-08 18:17:02 +0200 |
| commit | 8435c81d3508a6466af61dfb84742295f90c888b (patch) | |
| tree | b9c8431a5f22764179f443af673b7525c8e14e51 | |
| parent | 6b8ea575996cd277c74151489fcbfd7fbd78db92 (diff) | |
| parent | da583b03037660b317ec7a21e9886ca8a42f6fc3 (diff) | |
Merge pull request #14791 from vespa-engine/balder/reduce-semi-unbound-down-to-default
Reduce semi unbound task limit down in order to avoid excessive memor…
| -rw-r--r-- | searchcore/src/vespa/searchcore/config/proton.def | 2 | ||||
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/threading_service_config.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def index fd60781d868..bcc35204efd 100644 --- a/searchcore/src/vespa/searchcore/config/proton.def +++ b/searchcore/src/vespa/searchcore/config/proton.def @@ -135,7 +135,7 @@ indexing.tasklimit int default=1000 restart ## nonzero. The number is divided by the number of indexing threads, ## i.e. when indexing.threads is 4 and indexing.semiunboundtasklimit ## is 40000 then effective task limit is 10000. -indexing.semiunboundtasklimit int default = 40000 restart +indexing.semiunboundtasklimit int default = 1000 restart ## Kind of watermark for when to activate extra manpower ## Utilized if optimize is set to either THROUGHPUT or ADAPTIVE diff --git a/searchcore/src/vespa/searchcore/proton/server/threading_service_config.cpp b/searchcore/src/vespa/searchcore/proton/server/threading_service_config.cpp index cf9f27a94af..3b268835331 100644 --- a/searchcore/src/vespa/searchcore/proton/server/threading_service_config.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/threading_service_config.cpp @@ -60,7 +60,7 @@ ThreadingServiceConfig::make(const ProtonConfig &cfg, double concurrency, const { uint32_t indexingThreads = calculateIndexingThreads(cfg.indexing, concurrency, cpuInfo); return ThreadingServiceConfig(indexingThreads, cfg.indexing.tasklimit, - (cfg.indexing.semiunboundtasklimit / indexingThreads), + std::max(uint32_t(cfg.indexing.tasklimit), (cfg.indexing.semiunboundtasklimit / indexingThreads)), selectOptimization(cfg.indexing.optimize), cfg.indexing.kindOfWatermark, vespalib::from_s(cfg.indexing.reactiontime)); |