summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-01-31 10:52:28 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-01-31 10:52:28 +0000
commit9c25abde06d5a12f1fad2c1d2e1c2d0baf1812d0 (patch)
treef34bcb6f7eccb72b8e3954a98352b1405d70d6bd /searchcore
parent732bc6898196689766e8aa9e671efe38d73fd1a8 (diff)
We can not maintain the backwards compability by giving it a minmum of 8 cores.
Especially when we provide small thin machines.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/proton.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
index 57f36d10745..ecfca857bd5 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
@@ -92,11 +92,10 @@ size_t
deriveCompactionCompressionThreads(const ProtonConfig &proton,
const HwInfo::Cpu &cpuInfo) {
size_t scaledCores = (size_t)std::ceil(cpuInfo.cores() * proton.feeding.concurrency);
- size_t threads = std::max(scaledCores, 8ul);
// 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 #documentsdbs * 2
- return std::max(threads, proton.documentdb.size() * 2);
+ // but we will not be cheap and give it one extra.
+ return std::max(scaledCores, proton.documentdb.size() + 1 + 1);
}
const vespalib::string CUSTOM_COMPONENT_API_PATH = "/state/v1/custom/component";