aboutsummaryrefslogtreecommitdiffstats
path: root/config-proxy
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-06-08 15:08:39 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2022-06-08 15:08:39 +0000
commitc13a435a8ee30ab46d2cdae38504446e794dec7e (patch)
tree628d96c00d082550e257f464392a695c911cfabd /config-proxy
parent26c06870f4d39e5a74bc32c17f2c88a14d23ca50 (diff)
Only enable -XX:+UseTransparentHugePages if heap is at least 2x hugepage size.
Diffstat (limited to 'config-proxy')
-rwxr-xr-xconfig-proxy/src/main/sh/vespa-config-ctl.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/config-proxy/src/main/sh/vespa-config-ctl.sh b/config-proxy/src/main/sh/vespa-config-ctl.sh
index 8f2e6a44563..1fa7e31de14 100755
--- a/config-proxy/src/main/sh/vespa-config-ctl.sh
+++ b/config-proxy/src/main/sh/vespa-config-ctl.sh
@@ -109,7 +109,12 @@ 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
- jvmopts="-Xms32M -Xmx128M -XX:+PreserveFramePointer -XX:+UseTransparentHugePages -XX:CompressedClassSpaceSize=32m -XX:MaxDirectMemorySize=32m -XX:ThreadStackSize=448 -XX:MaxJavaStackTraceDepth=1000 -XX:-OmitStackTraceInFastThrow"
+ # 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
+ 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
export VESPA_SERVICE_NAME