diff options
| author | Håkon Hallingstad <hakon@oath.com> | 2018-08-17 12:48:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 12:48:06 +0200 |
| commit | 3aeafd4fd95e7dddf30ebd368986da6726bf9dd7 (patch) | |
| tree | f72663d2a48d80b76e8f1babc31a47229dd30796 | |
| parent | c05e7c7b7b8be3d81912aba27484bb3adaed9371 (diff) | |
| parent | 78eb659d90907971948b522f72af7054ad224882 (diff) | |
Merge pull request #6606 from vespa-engine/hakonhall/avoid-exitonoutofmemoryerror
Avoid ExitOnOutOfMemoryError
| -rwxr-xr-x | standalone-container/src/main/sh/standalone-container.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh index f9eddafbfbb..84ce53e0ccf 100755 --- a/standalone-container/src/main/sh/standalone-container.sh +++ b/standalone-container/src/main/sh/standalone-container.sh @@ -151,13 +151,19 @@ StartCommand() { printenv > "$cfpfile" FixDataDirectory "$bundlecachedir" + # TODO: Change + # -XX:OnOutOfMemoryError='kill -9 %p' + # to + # -XX:+ExitOutOfMemoryError + # below once java version is guaranteed to be >= 8 u92 + java \ "${jvm_arguments[@]}" \ -Xms128m -Xmx2048m \ -XX:+PreserveFramePointer \ -XX:+HeapDumpOnOutOfMemoryError \ -XX:HeapDumpPath="$VESPA_HOME/var/crash" \ - -XX:+ExitOnOutOfMemoryError \ + -XX:OnOutOfMemoryError='kill -9 %p' \ -Djava.library.path="$VESPA_HOME/lib64" \ -Djava.awt.headless=true \ -Dsun.rmi.dgc.client.gcInterval=3600000 \ |