diff options
| -rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 8 |
1 files changed, 8 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 da7e270890d..197bdd821a8 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -129,6 +129,14 @@ configure_memory() { available=`free -m | grep Mem | tr -s ' ' | cut -f2 -d' '` if hash cgget 2>/dev/null; then available_cgroup_bytes=$(cgget -nv -r memory.limit_in_bytes /) + if [ $? -ne 0 ]; then + # TODO: Replace this with call to cgget when we get libcgroup-tools >= 2.0 + available_cgroup_bytes=$(vespa_cg2get memory.max) + # If command failed or returned value is 'max' assign a big value (default in CGroup v1) + if ! [[ "$available_cgroup_bytes" =~ ^[0-9]+$ ]]; then + available_cgroup_bytes=$(((1 << 63) -1)) + fi + fi available_cgroup=$((available_cgroup_bytes >> 20)) available=$((available > available_cgroup ? available_cgroup : available)) fi |