- Control tcp-no-delay explicit.

- Wire in configuration of number of rpc targets.

2 files changed, 9 insertions, 2 deletions

diff --git a/storage/src/vespa/storage/config/stor-communicationmanager.def b/storage/src/vespa/storage/config/stor-communicationmanager.def
index 534be7cb6fe..70b8d3ca2b7 100644
--- a/storage/src/vespa/storage/config/stor-communicationmanager.def
+++ b/storage/src/vespa/storage/config/stor-communicationmanager.def
@@ -29,8 +29,14 @@ mbus.compress.type enum {NONE, LZ4, ZSTD} default=LZ4 restart
 ## TTL for rpc target cache
 mbus.rpctargetcache.ttl double default = 600 restart
 
+## Number of rpc targets per spec
+mbus.num_rpc_targets int default=1 restart
+
+## Use tcpNoDelay for mbus network writes
+mbus.tcp_no_delay bool default=true restart
+
 ## Number of threads for network.
-mbus.num_network_threads int default=1
+mbus.num_network_threads int default=1 restart
 
 ## Number of workers threads for messagebus
 ## Any value below 1 will be 1.
diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.cpp b/storage/src/vespa/storage/storageserver/communicationmanager.cpp
index 39f058d1085..7de1b7d869e 100644
--- a/storage/src/vespa/storage/storageserver/communicationmanager.cpp
+++ b/storage/src/vespa/storage/storageserver/communicationmanager.cpp
@@ -394,9 +394,10 @@ void CommunicationManager::configure(std::unique_ptr<CommunicationManagerConfig>
         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.setDispatchOnDecode(config->mbus.dispatchOnDecode);
         params.setDispatchOnEncode(config->mbus.dispatchOnEncode);
-        params.setTcpNoDelay(config->mbus.optimizeFor == CommunicationManagerConfig::Mbus::OptimizeFor::LATENCY);
+        params.setTcpNoDelay(config->mbus.tcpNoDelay);
 
         params.setIdentity(mbus::Identity(_component.getIdentity()));
         if (config->mbusport != -1) {