diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2017-05-09 13:52:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-09 13:52:23 +0200 |
| commit | 0e638682e7e319df2f0650033b484f85bfd3a7e0 (patch) | |
| tree | 414eef4cfb6f16cb067aaf4aa3b5449983adbd0c | |
| parent | 2aead232f2dadfd9b3460b81f826edec3cf4a70a (diff) | |
| parent | 1e7efd7ddabb9fff21c9d76a2ff764bd7b740cd1 (diff) | |
Merge pull request #2417 from yahoo/bjorncs/container-extension-script
Run extension script if exists
| -rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/container-disc/src/main/sh/vespa-start-container-daemon.sh b/container-disc/src/main/sh/vespa-start-container-daemon.sh index dd79e0dd054..d76be872d63 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -247,6 +247,13 @@ maybe_use_jsvc () { fi } +maybe_run_extensions() { + vespa_extensions_script="${VESPA_HOME}libexec/vespa/jdisc-extensions.sh" + if [ -f "${vespa_extensions_script}" ]; then + . "${vespa_extensions_script}" + fi +} + getconfig configure_memory configure_gcopts @@ -255,6 +262,7 @@ configure_classpath configure_numactl configure_preload maybe_use_jsvc +maybe_run_extensions exec $numactlcmd $envcmd java \ -Dconfig.id="${VESPA_CONFIG_ID}" \ |