diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-04-05 18:49:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-05 18:49:54 +0200 |
commit | 8dc32db0b5cc17fdd0df1f0ecbf3e7fa18b6b81e (patch) | |
tree | 14c5812f7ba21a978005e3edb7343bc9bb277cf4 /storage | |
parent | 727dc0ad691d794a988d59f59131584febbf56bb (diff) |
Revert "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, 1 insertions, 6 deletions
diff --git a/storage/src/vespa/storage/config/stor-communicationmanager.def b/storage/src/vespa/storage/config/stor-communicationmanager.def index c58a1a8ebfc..4536ea97855 100644 --- a/storage/src/vespa/storage/config/stor-communicationmanager.def +++ b/storage/src/vespa/storage/config/stor-communicationmanager.def @@ -31,11 +31,7 @@ mbus.rpctargetcache.ttl double default = 600 ## Number of threads for network. ## Any value below 1 will be 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.num_threads int default=1 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 19c157ffbd2..aff2b0f624f 100644 --- a/storage/src/vespa/storage/storageserver/communicationmanager.cpp +++ b/storage/src/vespa/storage/storageserver/communicationmanager.cpp @@ -422,7 +422,6 @@ 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)); |