diff options
author | Arne Juul <arnej@yahooinc.com> | 2022-11-09 13:49:42 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahooinc.com> | 2022-11-10 07:51:26 +0000 |
commit | b2927698f56d8f1438be44f0ab3ee75f0dc58deb (patch) | |
tree | 7d62cac9f5f57ab430c7454e38a63f4062d0b168 | |
parent | 621a0abe8a9c710b763bc93ae8b24e68a29dad03 (diff) |
optionally use new startup script
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/Container.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java index 9be5300094a..2fe082e50a2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java @@ -73,6 +73,7 @@ public abstract class Container extends AbstractService implements private final boolean retired; /** The unique index of this node */ private final int index; + private final boolean useOldStartupScript; private final boolean dumpHeapOnShutdownTimeout; private final double shutdownTimeoutS; @@ -91,6 +92,7 @@ public abstract class Container extends AbstractService implements this.parent = parent; this.retired = retired; this.index = index; + useOldStartupScript = deployState.featureFlags().useOldJdiscContainerStartup(); dumpHeapOnShutdownTimeout = deployState.featureFlags().containerDumpHeapOnShutdownTimeout(); shutdownTimeoutS = deployState.featureFlags().containerShutdownTimeout(); this.defaultHttpServer = new JettyHttpServer("DefaultHttpServer", containerClusterOrNull(parent), deployState); @@ -299,7 +301,10 @@ public abstract class Container extends AbstractService implements } public Optional<String> getStartupCommand() { - return Optional.of("PRELOAD=" + getPreLoad() + " exec vespa-start-container-daemon " + getJvmOptions() + " "); + if (useOldStartupScript) { + return Optional.of("PRELOAD=" + getPreLoad() + " exec vespa-start-container-daemon " + getJvmOptions() + " "); + } + return Optional.of("PRELOAD=" + getPreLoad() + " exec ${VESPA_HOME}/libexec/vespa/script-utils vespa-start-container-daemon " + getJvmOptions() + " "); } @Override |