From ff9785791affddb70748738bc38eb6a0610be9a2 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Thu, 16 Jun 2022 08:27:22 +0000 Subject: Also consider heap overrides when controlling THP for jvms. --- configserver/src/main/sh/start-configserver | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'configserver') 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 \ -- cgit v1.2.3