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 /config-proxy/src | |
| parent | 28b57f1d58d2af4580cd41a9d2e08b5af63590b8 (diff) | |
Also consider heap overrides when controlling THP for jvms.
Diffstat (limited to 'config-proxy/src')
| -rwxr-xr-x | config-proxy/src/main/sh/vespa-config-ctl.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/config-proxy/src/main/sh/vespa-config-ctl.sh b/config-proxy/src/main/sh/vespa-config-ctl.sh index aa36e09c995..d6d0075b555 100755 --- a/config-proxy/src/main/sh/vespa-config-ctl.sh +++ b/config-proxy/src/main/sh/vespa-config-ctl.sh @@ -109,11 +109,8 @@ case $1 in nohup nice sbin/vespa-retention-enforcer > ${LOGDIR}/vre-start.log 2>&1 </dev/null & configsources=`bin/vespa-print-default configservers_rpc` userargs=$VESPA_CONFIGPROXY_JVMARGS - # Note that the hardcoded memory Xmx=128 migh be overriden in VESPA_CONFIGPROXY_JVMARGS, - # hence rendering get_jvm_hugepage_settings incorrect, but it is better than not. - # TODO Better way of extracting heap size arguments. - heap_min=32 - heap_max=128 + heap_min=$(get_min_heap_mb "${userargs}" 32) + heap_max=$(get_max_heap_mb "${userargs}" 128) jvmopts="-Xms${heap_min}M -Xmx${heap_max}M -XX:+PreserveFramePointer $(get_jvm_hugepage_settings $heap_max) -XX:CompressedClassSpaceSize=32m -XX:MaxDirectMemorySize=32m -XX:ThreadStackSize=448 -XX:MaxJavaStackTraceDepth=1000 -XX:-OmitStackTraceInFastThrow" VESPA_SERVICE_NAME=configproxy |