diff options
4 files changed, 0 insertions, 20 deletions
diff --git a/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp b/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp index 76dcb81919f..fc060b48fc2 100644 --- a/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp @@ -15,7 +15,6 @@ RPCNetworkParams::RPCNetworkParams(config::ConfigUri configUri) : _listenPort(0), _maxInputBufferSize(256_Ki), _maxOutputBufferSize(256_Ki), - _numThreads(4), _numNetworkThreads(1), _numRpcTargets(1), _events_before_wakeup(1), diff --git a/messagebus/src/vespa/messagebus/network/rpcnetworkparams.h b/messagebus/src/vespa/messagebus/network/rpcnetworkparams.h index 4837d58b42c..4a4d92ba797 100644 --- a/messagebus/src/vespa/messagebus/network/rpcnetworkparams.h +++ b/messagebus/src/vespa/messagebus/network/rpcnetworkparams.h @@ -19,7 +19,6 @@ private: int _listenPort; uint32_t _maxInputBufferSize; uint32_t _maxOutputBufferSize; - uint32_t _numThreads; uint32_t _numNetworkThreads; uint32_t _numRpcTargets; uint32_t _events_before_wakeup; @@ -111,19 +110,6 @@ public: return *this; } - /** - * Sets number of threads for the thread pool. - * - * @param numThreads number of threads for thread pool - * @return This, to allow chaining. - */ - RPCNetworkParams &setNumThreads(uint32_t numThreads) { - _numThreads = numThreads; - return *this; - } - - uint32_t getNumThreads() const { return _numThreads; } - RPCNetworkParams &setTcpNoDelay(bool tcpNoDelay) { _tcpNoDelay = tcpNoDelay; return *this; diff --git a/storage/src/vespa/storage/config/stor-communicationmanager.def b/storage/src/vespa/storage/config/stor-communicationmanager.def index ba0368964c1..4c4c9ce615d 100644 --- a/storage/src/vespa/storage/config/stor-communicationmanager.def +++ b/storage/src/vespa/storage/config/stor-communicationmanager.def @@ -38,10 +38,6 @@ mbus.tcp_no_delay bool default=true restart ## Number of threads for network. mbus.num_network_threads int default=1 restart -## Number of workers threads for messagebus -## Any value below 1 will be 1. -mbus.num_threads int default=4 restart - ## The number of events in the queue of a network (FNET) thread before it is woken up. mbus.events_before_wakeup int default=1 restart diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.cpp b/storage/src/vespa/storage/storageserver/communicationmanager.cpp index 16ee59bffb1..7fb6685a8b5 100644 --- a/storage/src/vespa/storage/storageserver/communicationmanager.cpp +++ b/storage/src/vespa/storage/storageserver/communicationmanager.cpp @@ -352,7 +352,6 @@ void CommunicationManager::configure(std::unique_ptr<CommunicationManagerConfig> LOG(debug, "setting up slobrok config from id: '%s", _configUri.getConfigId().c_str()); 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.setNumRpcTargets(std::max(1, config->mbus.numRpcTargets)); params.events_before_wakeup(std::max(1, config->mbus.eventsBeforeWakeup)); |