diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-04-03 16:11:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-03 16:11:53 +0200 |
commit | a7a668ac285df3f5bacf263ca103a25ad0ff5ed6 (patch) | |
tree | fbd95b4175f54319ec83b54ba3e618aea716002c /storage | |
parent | 6299f2bf521a233f47d76fc6efa30d46aa417910 (diff) | |
parent | 55787c4169eb0f30695101c228a76e9a1992ba63 (diff) |
Merge pull request #12821 from vespa-engine/balder/control-net-and-worker-threads-independent
Control mbus worker threads and network threads separately.
Diffstat (limited to 'storage')
-rw-r--r-- | storage/src/vespa/storage/config/stor-communicationmanager.def | 6 | ||||
-rw-r--r-- | storage/src/vespa/storage/storageserver/communicationmanager.cpp | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/storage/src/vespa/storage/config/stor-communicationmanager.def b/storage/src/vespa/storage/config/stor-communicationmanager.def index 4536ea97855..c58a1a8ebfc 100644 --- a/storage/src/vespa/storage/config/stor-communicationmanager.def +++ b/storage/src/vespa/storage/config/stor-communicationmanager.def @@ -31,7 +31,11 @@ mbus.rpctargetcache.ttl double default = 600 ## Number of threads for network. ## Any value below 1 will be 1. -mbus.num_threads int default=1 +mbus.num_network_threads int default=1 + +## Number of workers threads for messagebus. +## Any value below 1 will be 1. +mbus.num_threads int default=2 mbus.optimize_for enum {LATENCY, THROUGHPUT} default = LATENCY diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.cpp b/storage/src/vespa/storage/storageserver/communicationmanager.cpp index aff2b0f624f..19c157ffbd2 100644 --- a/storage/src/vespa/storage/storageserver/communicationmanager.cpp +++ b/storage/src/vespa/storage/storageserver/communicationmanager.cpp @@ -422,6 +422,7 @@ void CommunicationManager::configure(std::unique_ptr<CommunicationManagerConfig> mbus::RPCNetworkParams params(_configUri); params.setConnectionExpireSecs(config->mbus.rpctargetcache.ttl); params.setNumThreads(std::max(1, config->mbus.numThreads)); + params.setNumNetworkThreads(std::max(1, config->mbus.numNetworkThreads)); params.setDispatchOnDecode(config->mbus.dispatchOnDecode); params.setDispatchOnEncode(config->mbus.dispatchOnEncode); params.setOptimizeFor(convert(config->mbus.optimizeFor)); |