diff options
| -rwxr-xr-x | config-proxy/src/main/sh/vespa-config-ctl.sh | 2 | ||||
| -rwxr-xr-x | configserver/src/main/sh/start-configserver | 2 | ||||
| -rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 4 | ||||
| -rwxr-xr-x | logserver/bin/logserver-start.sh | 2 | ||||
| -rwxr-xr-x | standalone-container/src/main/sh/standalone-container.sh | 2 |
5 files changed, 6 insertions, 6 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 diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index 03ce136e13c..8a1cbd0f0a8 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -161,7 +161,7 @@ vespa-run-as-vespa-user vespa-runserver -s configserver -r 30 -p $pidfile -- \ -Xms128m -Xmx2048m \ -XX:+PreserveFramePointer \ -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${VESPA_HOME}/var/crash \ - -XX:OnOutOfMemoryError='kill -9 %p' \ + -XX:+ExitOnOutOfMemoryError \ $jvmargs \ -Djava.library.path=${VESPA_HOME}/lib64 \ -Djava.awt.headless=true \ 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 88c8d133d03..e6219ab0467 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -193,7 +193,7 @@ exec_jsvc () { -XX:MaxJavaStackTraceDepth=1000000 \ -XX:+HeapDumpOnOutOfMemoryError \ -XX:HeapDumpPath="${VESPA_HOME}/var/crash" \ - -XX:OnOutOfMemoryError='kill -9 %p' \ + -XX:+ExitOnOutOfMemoryError \ -Djava.library.path="${VESPA_HOME}/lib64" \ -Djava.awt.headless=true \ -Djavax.net.ssl.keyStoreType=JKS \ @@ -265,7 +265,7 @@ exec $numactlcmd $envcmd java \ -XX:MaxJavaStackTraceDepth=1000000 \ -XX:+HeapDumpOnOutOfMemoryError \ -XX:HeapDumpPath="${VESPA_HOME}/var/crash" \ - -XX:OnOutOfMemoryError='kill -9 %p' \ + -XX:+ExitOnOutOfMemoryError \ -Djava.library.path="${VESPA_HOME}/lib64" \ -Djava.awt.headless=true \ -Djavax.net.ssl.keyStoreType=JKS \ diff --git a/logserver/bin/logserver-start.sh b/logserver/bin/logserver-start.sh index c9e0551648e..b1082ddc6a7 100755 --- a/logserver/bin/logserver-start.sh +++ b/logserver/bin/logserver-start.sh @@ -76,7 +76,7 @@ cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; } addopts="-server -Xms64m -Xmx256m -XX:MaxDirectMemorySize=76m -XX:MaxJavaStackTraceDepth=1000000" -oomopt="-XX:OnOutOfMemoryError=kill -9 %p" +oomopt="-XX:+ExitOnOutOfMemoryError" jar="-jar $ROOT/lib/jars/logserver-jar-with-dependencies.jar" diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh index dc1f5c7b71e..f9eddafbfbb 100755 --- a/standalone-container/src/main/sh/standalone-container.sh +++ b/standalone-container/src/main/sh/standalone-container.sh @@ -157,7 +157,7 @@ StartCommand() { -XX:+PreserveFramePointer \ -XX:+HeapDumpOnOutOfMemoryError \ -XX:HeapDumpPath="$VESPA_HOME/var/crash" \ - -XX:OnOutOfMemoryError="kill -9 %p" \ + -XX:+ExitOnOutOfMemoryError \ -Djava.library.path="$VESPA_HOME/lib64" \ -Djava.awt.headless=true \ -Dsun.rmi.dgc.client.gcInterval=3600000 \ |