diff options
10 files changed, 12 insertions, 58 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index 149943a89dc..8addd6d3b6c 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -54,8 +54,8 @@ public interface ModelContext { boolean isBootstrap(); boolean isFirstTimeDeployment(); boolean useDedicatedNodeForLogserver(); - boolean useFdispatchByDefault(); - boolean dispatchWithProtobuf(); + default boolean useFdispatchByDefault() { return false; } // TODO Remove once 7.111 is the oldest old config models + default boolean dispatchWithProtobuf() { return true; } // TODO Remove once 7.111 is the oldest old config models boolean useAdaptiveDispatch(); // TODO: Remove temporary default implementation default Optional<TlsSecrets> tlsSecrets() { return Optional.empty(); } diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java index 0dc08c19b92..c304e7efa09 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java @@ -38,8 +38,6 @@ public class TestProperties implements ModelContext.Properties { private boolean isBootstrap = false; private boolean isFirstTimeDeployment = false; private boolean useDedicatedNodeForLogserver = false; - private boolean useFdispatchByDefault = true; - private boolean dispatchWithProtobuf = true; private boolean useAdaptiveDispatch = false; private double defaultTermwiseLimit = 1.0; private Optional<TlsSecrets> tlsSecrets = Optional.empty(); @@ -60,8 +58,6 @@ public class TestProperties implements ModelContext.Properties { @Override public boolean isFirstTimeDeployment() { return isFirstTimeDeployment; } @Override public boolean useAdaptiveDispatch() { return useAdaptiveDispatch; } @Override public boolean useDedicatedNodeForLogserver() { return useDedicatedNodeForLogserver; } - @Override public boolean useFdispatchByDefault() { return useFdispatchByDefault; } - @Override public boolean dispatchWithProtobuf() { return dispatchWithProtobuf; } @Override public Optional<TlsSecrets> tlsSecrets() { return tlsSecrets; } @Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java index c12ef3cf30f..76617bf1b9f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java @@ -106,8 +106,6 @@ public class IndexedSearchCluster extends SearchCluster private final SimpleConfigProducer dispatchParent; private final DispatchGroup rootDispatch; private DispatchSpec dispatchSpec; - private final boolean useFdispatchByDefault; - private final boolean dispatchWithProtobuf; private final boolean useAdaptiveDispatch; private List<SearchNode> searchNodes = new ArrayList<>(); @@ -126,8 +124,6 @@ public class IndexedSearchCluster extends SearchCluster unionCfg = new UnionConfiguration(this, documentDbs); dispatchParent = new SimpleConfigProducer(this, "dispatchers"); rootDispatch = new DispatchGroup(this); - useFdispatchByDefault = deployState.getProperties().useFdispatchByDefault(); - dispatchWithProtobuf = deployState.getProperties().dispatchWithProtobuf(); useAdaptiveDispatch = deployState.getProperties().useAdaptiveDispatch(); } @@ -440,8 +436,6 @@ public class IndexedSearchCluster extends SearchCluster } builder.maxNodesDownPerGroup(rootDispatch.getMaxNodesDownPerFixedRow()); builder.useMultilevelDispatch(useMultilevelDispatchSetup()); - builder.useFdispatchByDefault(useFdispatchByDefault); - builder.dispatchWithProtobuf(dispatchWithProtobuf); builder.useLocalNode(tuning.dispatch.useLocalNode); builder.searchableCopies(rootDispatch.getSearchableCopies()); if (searchCoverage != null) { diff --git a/configdefinitions/src/vespa/dispatch.def b/configdefinitions/src/vespa/dispatch.def index 32a1d8fe2d1..84d5c032395 100644 --- a/configdefinitions/src/vespa/dispatch.def +++ b/configdefinitions/src/vespa/dispatch.def @@ -16,13 +16,6 @@ maxNodesDownPerGroup int default=0 # Distribution policy for group selection distributionPolicy enum { ROUNDROBIN, ADAPTIVE } default=ROUNDROBIN -# Should fdispatch be used as the default dispatcher -# Deprecated, will go away soon -useFdispatchByDefault bool default=false - -# Should protobuf/jrt be preferred over fs4 -dispatchWithProtobuf bool default=false - # Is multi-level dispatch configured for this cluster # Deprecated, will go away soon, NOOP useMultilevelDispatch bool default=false diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index 2b36f3496fe..48f5618886b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -132,9 +132,7 @@ public class ModelContextImpl implements ModelContext { private final boolean isBootstrap; private final boolean isFirstTimeDeployment; private final boolean useDedicatedNodeForLogserver; - private final boolean useFdispatchByDefault; private final boolean useAdaptiveDispatch; - private final boolean dispatchWithProtobuf; private final Optional<TlsSecrets> tlsSecrets; private final double defaultTermwiseLimit; @@ -166,10 +164,6 @@ public class ModelContextImpl implements ModelContext { this.isFirstTimeDeployment = isFirstTimeDeployment; this.useDedicatedNodeForLogserver = Flags.USE_DEDICATED_NODE_FOR_LOGSERVER.bindTo(flagSource) .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); - this.useFdispatchByDefault = Flags.USE_FDISPATCH_BY_DEFAULT.bindTo(flagSource) - .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); - this.dispatchWithProtobuf = Flags.DISPATCH_WITH_PROTOBUF.bindTo(flagSource) - .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); this.useAdaptiveDispatch = Flags.USE_ADAPTIVE_DISPATCH.bindTo(flagSource) .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); this.tlsSecrets = tlsSecrets; @@ -221,12 +215,6 @@ public class ModelContextImpl implements ModelContext { public boolean useDedicatedNodeForLogserver() { return useDedicatedNodeForLogserver; } @Override - public boolean useFdispatchByDefault() { return useFdispatchByDefault; } - - @Override - public boolean dispatchWithProtobuf() { return dispatchWithProtobuf; } - - @Override public boolean useAdaptiveDispatch() { return useAdaptiveDispatch; } @Override diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java index af34fc3e106..7369b33e82d 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java @@ -84,7 +84,7 @@ public class Dispatcher extends AbstractComponent { VipStatus vipStatus, Metric metric) { var searchCluster = new SearchCluster(clusterId, dispatchConfig, containerClusterSize, vipStatus); - var rpcFactory = new RpcInvokerFactory(new RpcResourcePool(dispatchConfig), searchCluster, !dispatchConfig.useFdispatchByDefault()); + var rpcFactory = new RpcInvokerFactory(new RpcResourcePool(dispatchConfig), searchCluster); return new Dispatcher(searchCluster, dispatchConfig, rpcFactory, rpcFactory, metric); } diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcInvokerFactory.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcInvokerFactory.java index d9a76965c3e..242ba5eb818 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcInvokerFactory.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcInvokerFactory.java @@ -27,12 +27,10 @@ public class RpcInvokerFactory extends InvokerFactory implements PingFactory { private final static CompoundName dispatchSummaries = new CompoundName("dispatch.summaries"); private final RpcResourcePool rpcResourcePool; - private final boolean dispatchWithProtobuf; - public RpcInvokerFactory(RpcResourcePool rpcResourcePool, SearchCluster searchCluster, boolean dispatchWithProtobuf) { + public RpcInvokerFactory(RpcResourcePool rpcResourcePool, SearchCluster searchCluster) { super(searchCluster); this.rpcResourcePool = rpcResourcePool; - this.dispatchWithProtobuf = dispatchWithProtobuf; } @Override @@ -45,7 +43,7 @@ public class RpcInvokerFactory extends InvokerFactory implements PingFactory { Query query = result.getQuery(); boolean summaryNeedsQuery = searcher.summaryNeedsQuery(query); - boolean useProtoBuf = query.properties().getBoolean(Dispatcher.dispatchProtobuf, dispatchWithProtobuf); + boolean useProtoBuf = query.properties().getBoolean(Dispatcher.dispatchProtobuf, true); boolean useDispatchDotSummaries = query.properties().getBoolean(dispatchSummaries, false); return ((useDispatchDotSummaries || !useProtoBuf) && ! summaryNeedsQuery) 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 afb9cf6f571..0aa91442712 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 @@ -26,7 +26,7 @@ class MockDispatcher extends Dispatcher { } private MockDispatcher(SearchCluster searchCluster, DispatchConfig dispatchConfig, RpcResourcePool rpcResourcePool) { - this(searchCluster, dispatchConfig, new RpcInvokerFactory(rpcResourcePool, searchCluster, dispatchConfig.dispatchWithProtobuf())); + this(searchCluster, dispatchConfig, new RpcInvokerFactory(rpcResourcePool, searchCluster)); } private MockDispatcher(SearchCluster searchCluster, DispatchConfig dispatchConfig, RpcInvokerFactory invokerFactory) { @@ -45,7 +45,6 @@ class MockDispatcher extends Dispatcher { dispatchConfigNodeBuilder.key(key++); // not used dispatchConfigBuilder.node(dispatchConfigNodeBuilder); } - dispatchConfigBuilder.useFdispatchByDefault(true); return new DispatchConfig(dispatchConfigBuilder); } } diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/FillTestCase.java b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/FillTestCase.java index a5086c1446d..5bdeb340678 100644 --- a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/FillTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/FillTestCase.java @@ -8,9 +8,7 @@ import com.yahoo.prelude.fastsearch.DocumentDatabase; import com.yahoo.prelude.fastsearch.FastHit; import com.yahoo.search.Query; import com.yahoo.search.Result; -import com.yahoo.search.dispatch.rpc.Client; -import com.yahoo.search.dispatch.rpc.RpcInvokerFactory; -import com.yahoo.search.dispatch.rpc.RpcResourcePool; + import org.junit.Test; import java.util.ArrayList; @@ -38,7 +36,7 @@ public class FillTestCase { nodes.put(1, client.createConnection("host1", 123)); nodes.put(2, client.createConnection("host2", 123)); RpcResourcePool rpcResourcePool = new RpcResourcePool(nodes); - RpcInvokerFactory factory = new RpcInvokerFactory(rpcResourcePool, null, true); + RpcInvokerFactory factory = new RpcInvokerFactory(rpcResourcePool, null); Query query = new Query(); Result result = new Result(query); @@ -75,7 +73,7 @@ public class FillTestCase { nodes.put(1, client.createConnection("host1", 123)); nodes.put(2, client.createConnection("host2", 123)); RpcResourcePool rpcResourcePool = new RpcResourcePool(nodes); - RpcInvokerFactory factory = new RpcInvokerFactory(rpcResourcePool, null, true); + RpcInvokerFactory factory = new RpcInvokerFactory(rpcResourcePool, null); Query query = new Query(); Result result = new Result(query); @@ -115,7 +113,7 @@ public class FillTestCase { nodes.put(1, client.createConnection("host1", 123)); nodes.put(2, client.createConnection("host2", 123)); RpcResourcePool rpcResourcePool = new RpcResourcePool(nodes); - RpcInvokerFactory factory = new RpcInvokerFactory(rpcResourcePool, null, true); + RpcInvokerFactory factory = new RpcInvokerFactory(rpcResourcePool, null); Query query = new Query(); Result result = new Result(query); @@ -155,7 +153,7 @@ public class FillTestCase { Map<Integer, Client.NodeConnection> nodes = new HashMap<>(); nodes.put(0, client.createConnection("host0", 123)); RpcResourcePool rpcResourcePool = new RpcResourcePool(nodes); - RpcInvokerFactory factory = new RpcInvokerFactory(rpcResourcePool, null, true); + RpcInvokerFactory factory = new RpcInvokerFactory(rpcResourcePool, null); Query query = new Query(); Result result = new Result(query); @@ -173,7 +171,7 @@ public class FillTestCase { Map<Integer, Client.NodeConnection> nodes = new HashMap<>(); nodes.put(0, client.createConnection("host0", 123)); RpcResourcePool rpcResourcePool = new RpcResourcePool(nodes); - RpcInvokerFactory factory = new RpcInvokerFactory(rpcResourcePool, null, true); + RpcInvokerFactory factory = new RpcInvokerFactory(rpcResourcePool, null); Query query = new Query(); Result result = new Result(query); diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index c4d29d9e8c0..8bb16e8f334 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -97,24 +97,12 @@ public class Flags { "Takes effect on restart of Docker container", NODE_TYPE, APPLICATION_ID, HOSTNAME); - public static final UnboundBooleanFlag USE_FDISPATCH_BY_DEFAULT = defineFeatureFlag( - "use-fdispatch-by-default", true, - "Should fdispatch be used as the default instead of the java dispatcher", - "Takes effect at redeployment", - APPLICATION_ID); - public static final UnboundBooleanFlag USE_ADAPTIVE_DISPATCH = defineFeatureFlag( "use-adaptive-dispatch", false, "Should adaptive dispatch be used over round robin", "Takes effect at redeployment", APPLICATION_ID); - public static final UnboundBooleanFlag DISPATCH_WITH_PROTOBUF = defineFeatureFlag( - "dispatch-with-protobuf", false, - "Should the java dispatcher use protobuf/jrt as the default", - "Takes effect at redeployment", - APPLICATION_ID); - public static final UnboundBooleanFlag ENABLE_DYNAMIC_PROVISIONING = defineFeatureFlag( "enable-dynamic-provisioning", false, "Provision a new docker host when we otherwise can't allocate a docker node", |