diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-09-27 22:08:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 22:08:41 +0200 |
| commit | cdcbe0f133a6f5b5aedbd8ab9e2b10c6d33e13a6 (patch) | |
| tree | 2bfe895599b18bb8262a1114b6fd174df080ca73 | |
| parent | 96466df8750a5459d9d7505a78d19d03db20d312 (diff) | |
| parent | df2d863fb5f7f46a57c444842060d79624bfc01f (diff) | |
Merge pull request #3549 from vespa-engine/balder/preserve-framepointer
The cost of preserving the framepointer is small enough to allow it b…
| -rwxr-xr-x | configserver/src/main/sh/start-configserver | 1 | ||||
| -rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index 43bb6b2ba83..4b0191e145a 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -135,6 +135,7 @@ fixddir $bundlecachedir vespa-run-as-vespa-user vespa-runserver -s configserver -r 30 -p $pidfile -- \ java \ -Xms128m -Xmx2048m \ + -XX:+PreserveFramePointer \ -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${VESPA_HOME}/var/crash \ -XX:OnOutOfMemoryError='kill -9 %p' \ $jvmargs \ 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 33f61c3660c..6f0c97f6177 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -186,6 +186,7 @@ exec_jsvc () { configure_preload exec $numactlcmd $envcmd $jsvc_binary_name \ -Dconfig.id="${VESPA_CONFIG_ID}" \ + -XX:+PreserveFramePointer \ ${jsvc_opts} \ ${memory_options} \ ${jvm_gcopts} \ @@ -258,6 +259,7 @@ maybe_use_jsvc exec $numactlcmd $envcmd java \ -Dconfig.id="${VESPA_CONFIG_ID}" \ + -XX:+PreserveFramePointer \ ${memory_options} \ ${jvm_gcopts} \ -XX:MaxJavaStackTraceDepth=-1 \ |