BUG: Handle Cgroups v2 memory limit set to 0 or max

haproxytech · Jul 25, 2023 · f6685ce · f6685ce
1 parent b0331ef
commit f6685ce
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/fs/etc/services.d/haproxy/run b/fs/etc/services.d/haproxy/run
@@ -10,8 +10,10 @@ fi
 if [ -r "${CG_LIMIT_FILE}" ]; then
     MEMLIMIT_CG=$(awk '{print int($1 / 1024 / 1024 * 2 / 3)}' "${CG_LIMIT_FILE}")
 
-    if [ ${MEMLIMIT_CG} -lt ${MEMLIMIT} ]; then
-        MEMLIMIT=${MEMLIMIT_CG}
+    if [ "${MEMLIMIT_CG}" -gt 0 ]; then
+        if [ "${MEMLIMIT_CG}" -lt "${MEMLIMIT}" ]; then
+            MEMLIMIT="${MEMLIMIT_CG}"
+        fi
     fi
 fi
 

diff --git a/fs/etc/services.d/ingress-controller/run b/fs/etc/services.d/ingress-controller/run
@@ -18,8 +18,10 @@ fi
 if [ -r "${CG_LIMIT_FILE}" ]; then
     MEMLIMIT_CG=$(awk '{print int($1 / 1024 / 1024 / 3)}' "${CG_LIMIT_FILE}")
 
-    if [ ${MEMLIMIT_CG} -lt ${MEMLIMIT} ]; then
-        MEMLIMIT=${MEMLIMIT_CG}
+    if [ "${MEMLIMIT_CG}" -gt 0 ]; then
+        if [ "${MEMLIMIT_CG}" -lt "${MEMLIMIT}" ]; then
+            MEMLIMIT="${MEMLIMIT_CG}"
+        fi
     fi
 fi