diff options
| author | Valerij Fredriksen <valerij92@gmail.com> | 2019-06-22 11:56:16 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerij92@gmail.com> | 2019-06-22 11:56:16 +0200 |
| commit | 68758eddcb0da795efd40bb4a18236b8f828f56b (patch) | |
| tree | 3ca718a0d6368b392cc530d6d65d19dd56c81a3b /container-disc | |
| parent | 25ae53f995d0110d27afcc430bcf19b1e6ef5755 (diff) | |
Get memory limit from cgroup if possible and is set
Diffstat (limited to 'container-disc')
| -rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 5 |
1 files changed, 5 insertions, 0 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 65826e650c4..85c113492bc 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -71,6 +71,11 @@ configure_memory() { available="$VESPA_TOTAL_MEMORY_MB" else available=`free -m | grep Mem | tr -s ' ' | cut -f2 -d' '` + if [ -x "$(command -v cgget)" ]; then + available_cgroup_bytes=$(cgget -nv -r memory.limit_in_bytes /) + available_cgroup=$((available_cgroup_bytes >> 20)) + available=$((available > available_cgroup ? available_cgroup : available)) + fi fi jvm_heapsize=$((available * jvm_heapSizeAsPercentageOfPhysicalMemory / 100)) |