aboutsummaryrefslogtreecommitdiffstats
path: root/container-disc/src
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2022-02-09 07:48:12 +0100
committerGitHub <noreply@github.com>2022-02-09 07:48:12 +0100
commitf99a9a1005f35117e90f0df0d6f9c2bb36357d07 (patch)
treec04833d26ba4f515d274e57549e84a57a74d3886 /container-disc/src
parent3306991027b5dace7fb658eccc6d58bc58487070 (diff)
parent0d7da7386aebe4ab8b1c098ac348db259549e2d2 (diff)
Merge pull request #21113 from vespa-engine/hmusum/exit-on-error-when-getting-config
Exit on error when getting config [run-systemtest]
Diffstat (limited to 'container-disc/src')
-rwxr-xr-xcontainer-disc/src/main/sh/vespa-start-container-daemon.sh2
1 files changed, 2 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 1aad9f18616..a6c2c5999a8 100755
--- a/container-disc/src/main/sh/vespa-start-container-daemon.sh
+++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh
@@ -46,6 +46,7 @@ printenv > $cfpfile || exit 1
getconfig() {
+ set -e
qrstartcfg=""
case "${VESPA_CONFIG_ID}" in
dir:*)
@@ -58,6 +59,7 @@ getconfig() {
esac
cmds=`echo "$qrstartcfg" | perl -ne 's/^(\w+)\.(\w+) (.*)/$1_$2=$3/ && print'`
eval "$cmds"
+ set +e
}
# Print the value of the cgroups v2 interface filename $1 for current process,