diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-06-16 08:27:22 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-06-16 08:27:22 +0000 |
| commit | ff9785791affddb70748738bc38eb6a0610be9a2 (patch) | |
| tree | 188e68046b40a6f40e7978fb44ca2d22a7d23faa /configserver | |
| parent | 28b57f1d58d2af4580cd41a9d2e08b5af63590b8 (diff) | |
Also consider heap overrides when controlling THP for jvms.
Diffstat (limited to 'configserver')
| -rwxr-xr-x | configserver/src/main/sh/start-configserver | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index cf0ebfbbe40..8127b0bfafc 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -161,11 +161,8 @@ 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 +heap_min=$(get_min_heap_mb "${jvmargs}" 128) +heap_max=$(get_max_heap_mb "${jvmargs}" 2048) vespa-run-as-vespa-user vespa-runserver -s ${VESPA_SERVICE_NAME} -r 30 -p $pidfile -- \ java \ -Xms${heap_min}m -Xmx${heap_max}m \ |