summaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-06-09 10:26:45 +0200
committerGitHub <noreply@github.com>2022-06-09 10:26:45 +0200
commitcc4a2a9a0e2b21af2a96cb8169cf69dad7e046ca (patch)
tree429769bccdac3c6f7f589b85a96449169402dc4f /container-disc
parentd86805df6437f038b1147f29559e3991d1727f84 (diff)
parentacc487fd4d8de85ae2534b727e4368bdb39034db (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 'container-disc')
-rwxr-xr-xcontainer-disc/src/main/sh/vespa-start-container-daemon.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/container-disc/src/main/sh/vespa-start-container-daemon.sh b/container-disc/src/main/sh/vespa-start-container-daemon.sh
index 76d3f5e3c68..b27e02b6c23 100755
--- a/container-disc/src/main/sh/vespa-start-container-daemon.sh
+++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh
@@ -174,7 +174,7 @@ configure_memory() {
memory_options="-Xms${jvm_minHeapsize}m -Xmx${jvm_heapsize}m"
memory_options="${memory_options} -XX:ThreadStackSize=${jvm_stacksize}"
memory_options="${memory_options} -XX:MaxDirectMemorySize=${maxDirectMemorySize}m"
- memory_options="${memory_options} -XX:+UseTransparentHugePages"
+ memory_options="${memory_options} $(get_jvm_hugepage_settings $jvm_heapsize)"
if ((jvm_compressedClassSpaceSize != 0)); then
memory_options="${memory_options} -XX:CompressedClassSpaceSize=${jvm_compressedClassSpaceSize}m"