summaryrefslogtreecommitdiffstats
path: root/config-proxy
diff options
context:
space:
mode:
authorArne Juul <arnej@yahoo-inc.com>2018-07-05 10:07:25 +0000
committerArne Juul <arnej@yahoo-inc.com>2018-07-18 12:53:47 +0000
commitdeef1a054f12ad9a4c230e57943ed12be172ebfb (patch)
treeeeaab375e13f736bc83a188f921edc3581afdcb1 /config-proxy
parent27b628f599ca9e3f0432ab849ea83bb6f70ed03b (diff)
just exit on out of memory
* asking java to fork 'kill -9 %p' will often fail with "os::fork_and_exec failed: Cannot allocate memory (12)" message. * instead, use a newish option (from JDK 8u92) to just exit
Diffstat (limited to 'config-proxy')
-rwxr-xr-xconfig-proxy/src/main/sh/vespa-config-ctl.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/config-proxy/src/main/sh/vespa-config-ctl.sh b/config-proxy/src/main/sh/vespa-config-ctl.sh
index 669882c11fd..a670e69cdbf 100755
--- a/config-proxy/src/main/sh/vespa-config-ctl.sh
+++ b/config-proxy/src/main/sh/vespa-config-ctl.sh
@@ -115,7 +115,7 @@ case $1 in
echo "Starting config proxy using $configsources as config source(s)"
vespa-runserver -r 10 -s configproxy -p $P_CONFIG_PROXY -- \
java ${jvmopts} \
- -XX:OnOutOfMemoryError="kill -9 %p" $(getJavaOptionsIPV46) \
+ -XX:+ExitOnOutOfMemoryError $(getJavaOptionsIPV46) \
-Dproxyconfigsources="${configsources}" ${userargs} \
-cp $cp com.yahoo.vespa.config.proxy.ProxyServer 19090