diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-10-25 17:37:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-25 17:37:05 +0200 |
| commit | f73ba9276acf8b1032d1c015c434bf544317fad1 (patch) | |
| tree | b7b02d5d5ba5e682cc5731e0a05e17efc21930ed /container-core | |
| parent | 373c68b2955c8a9ef77daa4e38622eec274b54ea (diff) | |
| parent | 1417a48bd4aecfb5e182d6c7b81960e3d7232309 (diff) | |
Merge pull request #24548 from vespa-engine/arnej/common-handle-env-root
* apply new common bootstrap
Diffstat (limited to 'container-core')
| -rwxr-xr-x | container-core/src/main/sh/find-pid | 5 | ||||
| -rwxr-xr-x | container-core/src/main/sh/vespa-jvm-dumper | 5 | ||||
| -rwxr-xr-x | container-core/src/main/sh/vespa-load-balancer-status | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/container-core/src/main/sh/find-pid b/container-core/src/main/sh/find-pid index 57393140e0b..74eade28d00 100755 --- a/container-core/src/main/sh/find-pid +++ b/container-core/src/main/sh/find-pid @@ -72,6 +72,9 @@ findhost () { findroot findhost +ROOT=${VESPA_HOME%/} +export ROOT + # END environment bootstrap section set -uo pipefail @@ -82,7 +85,7 @@ if (( $# != 1 )); then fi readonly service=$1 -readonly pid_file="$VESPA_HOME/var/run/$service.pid" +readonly pid_file="${VESPA_HOME}/var/run/$service.pid" if [ -f "$pid_file" ]; then parent_pid=$(cat "$pid_file") pid=$(pgrep --parent $parent_pid) diff --git a/container-core/src/main/sh/vespa-jvm-dumper b/container-core/src/main/sh/vespa-jvm-dumper index c0f5e653911..20ba1d59f53 100755 --- a/container-core/src/main/sh/vespa-jvm-dumper +++ b/container-core/src/main/sh/vespa-jvm-dumper @@ -72,6 +72,9 @@ findhost () { findroot findhost +ROOT=${VESPA_HOME%/} +export ROOT + # END environment bootstrap section set -euo pipefail @@ -89,7 +92,7 @@ if ! [ -d "${output_directory}" -a -w "${output_directory}" ]; then echo "Directory '${output_directory}' is not writable" exit 1 fi -jvm_pid=$($VESPA_HOME/libexec/vespa/find-pid "$service") +jvm_pid=$(${VESPA_HOME}/libexec/vespa/find-pid "$service") echo "Pid for '${service}' is '${jvm_pid}'" echo "Creating heap dump" diff --git a/container-core/src/main/sh/vespa-load-balancer-status b/container-core/src/main/sh/vespa-load-balancer-status index b9a54845532..ff2c3c88d3e 100755 --- a/container-core/src/main/sh/vespa-load-balancer-status +++ b/container-core/src/main/sh/vespa-load-balancer-status @@ -74,6 +74,9 @@ findhost () { findroot findhost +ROOT=${VESPA_HOME%/} +export ROOT + # END environment bootstrap section set -eu |