diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-02-09 11:14:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-09 11:14:37 +0100 |
commit | 8dac69c96f62d74b6cc3dfb06188b80e07a03607 (patch) | |
tree | 8767b7d74e4195d14e2578ae21d30c9c6c6cc09b | |
parent | c197a45f335cf6fdf780f3027ceead2605f8cb49 (diff) | |
parent | 27e0c481d57d6825e3c7ebe641f56ca573fbdf8a (diff) |
Merge pull request #21094 from vespa-engine/bjorncs/jdisc-pre-shutdown
Enable pre-shutdown command for jdisc by default
4 files changed, 2 insertions, 12 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 c4a120fc10c..0cf8b343b6a 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 @@ -110,7 +110,7 @@ public interface ModelContext { @ModelFeatureFlag(owners = {"vekterli"}) default double persistenceThrottlingWsDecrementFactor() { throw new UnsupportedOperationException("TODO specify default value"); } @ModelFeatureFlag(owners = {"vekterli"}) default double persistenceThrottlingWsBackoff() { throw new UnsupportedOperationException("TODO specify default value"); } @ModelFeatureFlag(owners = {"arnej"}) default boolean useQrserverServiceName() { return true; } - @ModelFeatureFlag(owners = {"bjorncs", "baldersheim"}) default boolean enableJdiscPreshutdownCommand() { return false; } + @ModelFeatureFlag(owners = {"bjorncs", "baldersheim"}) default boolean enableJdiscPreshutdownCommand() { return true; } } /** Warning: As elsewhere in this package, do not make backwards incompatible changes that will break old config models! */ diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java index 54b9a4511b0..ba5e8ed5544 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java @@ -29,7 +29,6 @@ public final class ApplicationContainer extends Container implements private final boolean isHostedVespa; private final boolean enableServerOcspStapling; private final boolean useQrserverServiceName; - private final boolean enablePreshutdownCommand; public ApplicationContainer(AbstractConfigProducer<?> parent, String name, int index, DeployState deployState) { this(parent, name, false, index, deployState); @@ -40,7 +39,6 @@ public final class ApplicationContainer extends Container implements this.isHostedVespa = deployState.isHosted(); this.enableServerOcspStapling = deployState.featureFlags().enableServerOcspStapling(); this.useQrserverServiceName = deployState.featureFlags().useQrserverServiceName(); - this.enablePreshutdownCommand = deployState.featureFlags().enableJdiscPreshutdownCommand(); addComponent(new SimpleComponent("com.yahoo.container.jdisc.messagebus.NetworkMultiplexerHolder")); addComponent(new SimpleComponent("com.yahoo.container.jdisc.messagebus.NetworkMultiplexerProvider")); @@ -109,7 +107,6 @@ public final class ApplicationContainer extends Container implements @Override public Optional<String> getPreShutdownCommand() { - if (!enablePreshutdownCommand) return Optional.empty(); int preshutdownTimeoutSeconds = 360; int rpcTimeoutSeconds = preshutdownTimeoutSeconds + 10; String rpcParams = "-t " + rpcTimeoutSeconds + " tcp/localhost:" + getRpcPort() + " prepareStop d:" + preshutdownTimeoutSeconds; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java index e397e6ab399..33cbb328c52 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java @@ -22,7 +22,6 @@ import java.util.List; public class JettyHttpServer extends SimpleComponent implements ServerConfig.Producer { private final ContainerCluster<?> cluster; - private final boolean enablePreshutdownCommand; private volatile boolean isHostedVespa; private final List<ConnectorFactory> connectorFactories = new ArrayList<>(); private final List<String> ignoredUserAgentsList = new ArrayList<>(); @@ -37,7 +36,6 @@ public class JettyHttpServer extends SimpleComponent implements ServerConfig.Pro for (String agent : deployState.featureFlags().ignoredHttpUserAgents()) { addIgnoredUserAgent(agent); } - this.enablePreshutdownCommand = deployState.featureFlags().enableJdiscPreshutdownCommand(); } public void setHostedVespa(boolean isHostedVespa) { this.isHostedVespa = isHostedVespa; } @@ -77,9 +75,7 @@ public class JettyHttpServer extends SimpleComponent implements ServerConfig.Pro .remotePortHeaders(List.of("X-Forwarded-Port", "y-rp"))); } configureJettyThreadpool(builder); - if (enablePreshutdownCommand) { - builder.stopTimeout(300); - } + builder.stopTimeout(300); } private void configureJettyThreadpool(ServerConfig.Builder builder) { 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 547494efcba..c50b75b3460 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 @@ -205,7 +205,6 @@ public class ModelContextImpl implements ModelContext { private final double persistenceThrottlingWsDecrementFactor; private final double persistenceThrottlingWsBackoff; private final boolean useQrserverServiceName; - private final boolean enableJdiscPreshutdownCommand; public FeatureFlags(FlagSource source, ApplicationId appId) { this.defaultTermwiseLimit = flagValue(source, appId, Flags.DEFAULT_TERM_WISE_LIMIT); @@ -249,7 +248,6 @@ public class ModelContextImpl implements ModelContext { this.persistenceThrottlingWsDecrementFactor = flagValue(source, appId, Flags.PERSISTENCE_THROTTLING_WS_DECREMENT_FACTOR); this.persistenceThrottlingWsBackoff = flagValue(source, appId, Flags.PERSISTENCE_THROTTLING_WS_BACKOFF); this.useQrserverServiceName = flagValue(source, appId, Flags.USE_QRSERVER_SERVICE_NAME); - this.enableJdiscPreshutdownCommand = flagValue(source, appId, Flags.ENABLE_JDISC_PRESHUTDOWN_COMMAND); } @Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; } @@ -295,7 +293,6 @@ public class ModelContextImpl implements ModelContext { @Override public double persistenceThrottlingWsDecrementFactor() { return persistenceThrottlingWsDecrementFactor; } @Override public double persistenceThrottlingWsBackoff() { return persistenceThrottlingWsBackoff; } @Override public boolean useQrserverServiceName() { return useQrserverServiceName; } - @Override public boolean enableJdiscPreshutdownCommand() { return enableJdiscPreshutdownCommand; } private static <V> V flagValue(FlagSource source, ApplicationId appId, UnboundFlag<? extends V, ?, ?> flag) { return flag.bindTo(source) |