From 68758eddcb0da795efd40bb4a18236b8f828f56b Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Sat, 22 Jun 2019 11:56:16 +0200 Subject: Get memory limit from cgroup if possible and is set --- container-disc/src/main/sh/vespa-start-container-daemon.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'container-disc/src') 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)) -- cgit v1.2.3