summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-02-27 16:33:55 +0100
committerGitHub <noreply@github.com>2018-02-27 16:33:55 +0100
commitd338264315807294252cfa5f41b52d5fc99e78fc (patch)
treeac45d3f8f1e834a9729ff3046e6805d9339e2a12
parent86029a0a0eefacc98b5c86cd8921eed98f4882e6 (diff)
parente23f938a49c42bfc3326d7aaa8cc62779fcd8aa0 (diff)
Merge pull request #5165 from vespa-engine/toregge/set-task-limit-for-documentdb-summary-executor
Use blocking thread stack executor for document summary writing.
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp3
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp
index a5523083df7..bcb5190081c 100644
--- a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp
@@ -13,7 +13,7 @@ ExecutorThreadingService::ExecutorThreadingService(uint32_t threads,
: _masterExecutor(1, stackSize),
_indexExecutor(1, stackSize, taskLimit),
- _summaryExecutor(1, stackSize),
+ _summaryExecutor(1, stackSize, taskLimit),
_masterService(_masterExecutor),
_indexService(_indexExecutor),
_summaryService(_summaryExecutor),
@@ -62,6 +62,7 @@ void
ExecutorThreadingService::setTaskLimit(uint32_t taskLimit)
{
_indexExecutor.setTaskLimit(taskLimit);
+ _summaryExecutor.setTaskLimit(taskLimit);
_indexFieldInverter.setTaskLimit(taskLimit);
_indexFieldWriter.setTaskLimit(taskLimit);
_attributeFieldWriter.setTaskLimit(taskLimit);
diff --git a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h
index 2328702e147..1daba7d7960 100644
--- a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h
+++ b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h
@@ -18,7 +18,7 @@ class ExecutorThreadingService : public searchcorespi::index::IThreadingService
private:
vespalib::ThreadStackExecutor _masterExecutor;
vespalib::BlockingThreadStackExecutor _indexExecutor;
- vespalib::ThreadStackExecutor _summaryExecutor;
+ vespalib::BlockingThreadStackExecutor _summaryExecutor;
ExecutorThreadService _masterService;
ExecutorThreadService _indexService;
ExecutorThreadService _summaryService;