diff options
4 files changed, 4 insertions, 4 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 c32d6fd5edc..7193433ccf7 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 @@ -123,7 +123,7 @@ public final class SessionCache extends AbstractComponent { .setListenPort(mbusConfig.port()) .setNumTargetsPerSpec(mbusConfig.numconnectionspertarget()) .setNumNetworkThreads(mbusConfig.numthreads()) - .setOptimization(RPCNetworkParams.Optimization.valueOf(mbusConfig.optimization().name())); + .setOptimization(RPCNetworkParams.Optimization.valueOf(mbusConfig.optimize_for().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 92d3cfbe512..9aef2b32a66 100644 --- a/container-messagebus/src/main/resources/configdefinitions/container-mbus.def +++ b/container-messagebus/src/main/resources/configdefinitions/container-mbus.def @@ -13,7 +13,7 @@ numconnectionspertarget int default=1 numthreads int default=2 # Optimize for latency, or throughput. -optimization enum {LATENCY, THROUGHPUT} default=LATENCY +optimize_for 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. diff --git a/storage/src/vespa/storage/config/stor-communicationmanager.def b/storage/src/vespa/storage/config/stor-communicationmanager.def index f05d9eca7e4..8f5b22aa7fa 100644 --- a/storage/src/vespa/storage/config/stor-communicationmanager.def +++ b/storage/src/vespa/storage/config/stor-communicationmanager.def @@ -33,7 +33,7 @@ mbus.rpctargetcache.ttl double default = 600 ## Any value below 1 will be 1. mbus.num_threads int default=4 -mbus.optimization enum {LATENCY, THROUGHPUT} default = LATENCY +mbus.optimize_for enum {LATENCY, THROUGHPUT} default = LATENCY ## Enable to use above thread pool for encoding replies ## False will use network(fnet) thread diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.cpp b/storage/src/vespa/storage/storageserver/communicationmanager.cpp index 78d2c9f9c21..fa2b0cda018 100644 --- a/storage/src/vespa/storage/storageserver/communicationmanager.cpp +++ b/storage/src/vespa/storage/storageserver/communicationmanager.cpp @@ -415,7 +415,7 @@ void CommunicationManager::configure(std::unique_ptr<CommunicationManagerConfig> params.setNumThreads(std::max(1, config->mbus.numThreads)); params.setDispatchOnDecode(config->mbus.dispatchOnDecode); params.setDispatchOnEncode(config->mbus.dispatchOnEncode); - params.setTcpNoDelay(config->mbus.optimization == CommunicationManagerConfig::Mbus::Optimization::LATENCY); + params.setTcpNoDelay(config->mbus.optimizeFor == CommunicationManagerConfig::Mbus::OptimizeFor::LATENCY); params.setIdentity(mbus::Identity(_component.getIdentity())); if (config->mbusport != -1) { |