diff options
| -rw-r--r-- | configdefinitions/src/vespa/dispatch.def | 4 | ||||
| -rw-r--r-- | container-search/src/test/java/com/yahoo/prelude/fastsearch/test/MockDispatcher.java | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/configdefinitions/src/vespa/dispatch.def b/configdefinitions/src/vespa/dispatch.def index c3f847fb5f3..9cef66f49e0 100644 --- a/configdefinitions/src/vespa/dispatch.def +++ b/configdefinitions/src/vespa/dispatch.def @@ -17,7 +17,8 @@ maxNodesDownPerGroup int default=0 distributionPolicy enum { ROUNDROBIN, ADAPTIVE } default=ROUNDROBIN # Should fdispatch be used as the default dispatcher -useFdispatchByDefault bool default=true +# Deprecated, will go away soon +useFdispatchByDefault bool default=false # Should protobuf/jrt be preferred over fs4 dispatchWithProtobuf bool default=false @@ -59,4 +60,5 @@ node[].host string node[].port int # The legacy fs4 port of this search node +# Deprecated, will go away soon node[].fs4port int default=0 diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/MockDispatcher.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/MockDispatcher.java index 92ccd7e46b2..61ee384d1d3 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/MockDispatcher.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/MockDispatcher.java @@ -30,7 +30,7 @@ class MockDispatcher extends Dispatcher { private MockDispatcher(SearchCluster searchCluster, DispatchConfig dispatchConfig, FS4ResourcePool fs4ResourcePool, RpcResourcePool rpcResourcePool) { - super(searchCluster, dispatchConfig, new RpcInvokerFactory(rpcResourcePool, searchCluster, !dispatchConfig.useFdispatchByDefault()), + super(searchCluster, dispatchConfig, new RpcInvokerFactory(rpcResourcePool, searchCluster, dispatchConfig.dispatchWithProtobuf()), new FS4PingFactory(fs4ResourcePool), new MockMetric()); } @@ -45,6 +45,7 @@ class MockDispatcher extends Dispatcher { dispatchConfigNodeBuilder.group(node.group()); dispatchConfigNodeBuilder.key(key++); // not used dispatchConfigBuilder.node(dispatchConfigNodeBuilder); + dispatchConfigBuilder.useFdispatchByDefault(true); } return new DispatchConfig(dispatchConfigBuilder); } |