diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-10 15:22:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-10 15:22:15 +0100 |
commit | f83580a20c9efbcf578189425cb58481ae2d2ecf (patch) | |
tree | ede787ca348e812c81ce04b1bcdde664779a38f5 /config-model | |
parent | 3bbe2f89775b05facb1de8d28ae1423353e0e674 (diff) | |
parent | 7ec90e986e2f9c036d4524c75c7a10f6003b0adc (diff) |
Merge pull request #24816 from vespa-engine/arnej/add-jdisc-startup-feature-flag
Arnej/add jdisc startup feature flag
Diffstat (limited to 'config-model')
-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 195ee775b1c..8094eae881f 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 |