From 4ddf0c7f069fe9d125b39eba44332b9027a91c2a Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Sun, 22 Sep 2019 09:03:04 +0200 Subject: Clean up the dispatch protobuf flag too. --- .../java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'configserver') 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 d18893ee108..f681bf819f0 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 @@ -133,7 +133,6 @@ public class ModelContextImpl implements ModelContext { private final boolean isFirstTimeDeployment; private final boolean useDedicatedNodeForLogserver; private final boolean useAdaptiveDispatch; - private final boolean dispatchWithProtobuf; private final Optional tlsSecrets; private final double defaultTermwiseLimit; @@ -165,8 +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.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,7 +218,7 @@ public class ModelContextImpl implements ModelContext { public boolean useFdispatchByDefault() { return false; } @Override - public boolean dispatchWithProtobuf() { return dispatchWithProtobuf; } + public boolean dispatchWithProtobuf() { return true; } @Override public boolean useAdaptiveDispatch() { return useAdaptiveDispatch; } -- cgit v1.2.3