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 /standalone-container | |
| parent | 28b57f1d58d2af4580cd41a9d2e08b5af63590b8 (diff) | |
Also consider heap overrides when controlling THP for jvms.
Diffstat (limited to 'standalone-container')
| -rwxr-xr-x | standalone-container/src/main/sh/standalone-container.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh index cb5d7e3d060..f55a6df5b76 100755 --- a/standalone-container/src/main/sh/standalone-container.sh +++ b/standalone-container/src/main/sh/standalone-container.sh @@ -167,11 +167,8 @@ StartCommand() { FixDataDirectory "$bundlecachedir" FixDataDirectory "$VESPA_HOME/var/crash" - # Note that the hardcoded memory Xmx=2048 migh be overridden by jvm_arguments, - # 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 "${jvm_arguments}" 128) + heap_max=$(get_max_heap_mb "${jvm_arguments}" 2048) java \ -Xms${heap_min}m -Xmx${heap_max}m \ -XX:+PreserveFramePointer \ |