summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-02-04 19:25:38 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-02-04 19:25:38 +0000
commitff110ce6c1ac2272596a0d80a437d522571a7374 (patch)
tree8928c53e5297c2bdf3ac2b4c513fc3620b593f50 /searchcore
parentd9b3da8cd2b65fc8399399e6beb9dcb5dc2fc7ad (diff)
Consider number of flush targets when computing minimum number of threads necessary.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/proton.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
index 6f398a0e75d..3542fcc3716 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
@@ -95,7 +95,7 @@ deriveCompactionCompressionThreads(const ProtonConfig &proton,
// We need at least 1 guaranteed free worker in order to ensure progress so #documentsdbs + 1 should suffice,
// but we will not be cheap and give it one extra.
- return std::max(scaledCores, proton.documentdb.size() + 1 + 1);
+ return std::max(scaledCores, proton.documentdb.size() + proton.flush.maxconcurrent + 1);
}
const vespalib::string CUSTOM_COMPONENT_API_PATH = "/state/v1/custom/component";