diff options
author | Arne Juul <arnej@yahoo-inc.com> | 2018-07-05 10:07:25 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahoo-inc.com> | 2018-07-18 12:53:47 +0000 |
commit | deef1a054f12ad9a4c230e57943ed12be172ebfb (patch) | |
tree | eeaab375e13f736bc83a188f921edc3581afdcb1 /container-disc | |
parent | 27b628f599ca9e3f0432ab849ea83bb6f70ed03b (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 'container-disc')
-rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 4 |
1 files changed, 2 insertions, 2 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 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 \ |