summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--storage/src/vespa/storage/storageserver/distributornode.cpp4
-rw-r--r--storageframework/src/vespa/storageframework/generic/thread/tickingthread.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/storage/src/vespa/storage/storageserver/distributornode.cpp b/storage/src/vespa/storage/storageserver/distributornode.cpp
index 0d129ffdb28..620bd3571ce 100644
--- a/storage/src/vespa/storage/storageserver/distributornode.cpp
+++ b/storage/src/vespa/storage/storageserver/distributornode.cpp
@@ -26,7 +26,9 @@ DistributorNode::DistributorNode(
: StorageNode(configUri, context, generationFetcher,
std::make_unique<HostInfo>(),
!communicationManager ? NORMAL : SINGLE_THREADED_TEST_MODE),
- _threadPool(framework::TickingThreadPool::createDefault("distributor")),
+ // TODO STRIPE: Change waitTime default to 100ms when legacy mode is removed.
+ _threadPool(framework::TickingThreadPool::createDefault("distributor",
+ (num_distributor_stripes > 0) ? 100ms : 5ms)),
_stripe_pool(std::make_unique<distributor::DistributorStripePool>()),
_context(context),
_timestamp_mutex(),
diff --git a/storageframework/src/vespa/storageframework/generic/thread/tickingthread.h b/storageframework/src/vespa/storageframework/generic/thread/tickingthread.h
index 0649d914c75..c80ba0e8945 100644
--- a/storageframework/src/vespa/storageframework/generic/thread/tickingthread.h
+++ b/storageframework/src/vespa/storageframework/generic/thread/tickingthread.h
@@ -78,6 +78,7 @@ struct ThreadLock {
struct TickingThreadPool : public ThreadLock {
using UP = std::unique_ptr<TickingThreadPool>;
+ // TODO STRIPE: Change waitTime default to 100ms when legacy mode is removed.
static TickingThreadPool::UP createDefault(
vespalib::stringref name,
vespalib::duration waitTime = 5ms,