diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-06-09 10:26:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-09 10:26:45 +0200 |
| commit | cc4a2a9a0e2b21af2a96cb8169cf69dad7e046ca (patch) | |
| tree | 429769bccdac3c6f7f589b85a96449169402dc4f /configserver | |
| parent | d86805df6437f038b1147f29559e3991d1727f84 (diff) | |
| parent | acc487fd4d8de85ae2534b727e4368bdb39034db (diff) | |
Merge pull request #23006 from vespa-engine/balder/do-not-enable-jvm-UseTransparentHugePages-unless-is-larger-than-2x-hugepage-size
Only enable -XX:+UseTransparentHugePages if heap is at least 2x hugep… [run-systemtest]
Diffstat (limited to 'configserver')
| -rwxr-xr-x | configserver/src/main/sh/start-configserver | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index 6cf668e346a..cf0ebfbbe40 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -161,10 +161,15 @@ rm -f $cfpfile vespa-run-as-vespa-user sh -c "printenv > $cfpfile" fixddir $bundlecachedir +# Note that the hardcoded memory Xmx=2048 migh be overridden by jvmargs, +# hence rendering get_jvm_hugepage_settings incorrect, but it is better than not. +# TODO Better way of extracting heap size arguments. +heap_min=128 +heap_max=2048 vespa-run-as-vespa-user vespa-runserver -s ${VESPA_SERVICE_NAME} -r 30 -p $pidfile -- \ java \ - -Xms128m -Xmx2048m \ - -XX:+UseTransparentHugePages \ + -Xms${heap_min}m -Xmx${heap_max}m \ + $(get_jvm_hugepage_settings $heap_max) \ -XX:+PreserveFramePointer \ -XX:+HeapDumpOnOutOfMemoryError \ -XX:HeapDumpPath="${VESPA_HOME}/var/crash" \ |