Add control over

 - num network threads
 - num connections per target
 - tcpnodelay
Defaults are unchanged.

2 files changed, 20 insertions, 2 deletions

diff --git a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java
index 113d99f77f9..c32d6fd5edc 100644
--- a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java
+++ b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/SessionCache.java
@@ -120,7 +120,10 @@ public final class SessionCache extends AbstractComponent {
         RPCNetworkParams netParams = new RPCNetworkParams()
                 .setSlobrokConfigId(slobrokConfigId)
                 .setIdentity(new Identity(identity))
-                .setListenPort(mbusConfig.port());
+                .setListenPort(mbusConfig.port())
+                .setNumTargetsPerSpec(mbusConfig.numconnectionspertarget())
+                .setNumNetworkThreads(mbusConfig.numthreads())
+                .setOptimization(RPCNetworkParams.Optimization.valueOf(mbusConfig.optimization().name()));
         return SharedMessageBus.newInstance(mbusParams, netParams);
     }
 
diff --git a/container-messagebus/src/main/resources/configdefinitions/container-mbus.def b/container-messagebus/src/main/resources/configdefinitions/container-mbus.def
index b18bec66959..92d3cfbe512 100644
--- a/container-messagebus/src/main/resources/configdefinitions/container-mbus.def
+++ b/container-messagebus/src/main/resources/configdefinitions/container-mbus.def
@@ -2,9 +2,24 @@
 namespace=container.jdisc
 
 #settings for message bus in container
-enabled bool default=false
+
+# Which network port is used
 port int default=0
+
+# Number of connections per target
+numconnectionspertarget int default=1
+
+# Number network threads
+numthreads int default=2
+
+# Optimize for latency, or throughput.
+optimization enum {LATENCY, THROUGHPUT} default=LATENCY
+
+# Everying below is deprecated and will go away very soon.
+# Dynamic throttling is used, and works better than anything else.
 maxpendingcount int default=2048
+
+enabled bool default=false
 #maxpendingsize is set in megabytes!
 maxpendingsize int default=100