silence warning-spam for containers with no memlimit

in cgroupv2 environments lxcfs walks up the cgroup tree
until it finds a limit, if it finds none it'll try to
convert an empty string to a number and spam a warning every
time a file requiring this info is accessed

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/debian/patches/extra/0001-proc_fuse-silence-error-when-we-find-no-memlimit.patch b/debian/patches/extra/0001-proc_fuse-silence-error-when-we-find-no-memlimit.patch
new file mode 100644 (file)
index 0000000..08c0f7d
--- /dev/null
+++ b/debian/patches/extra/0001-proc_fuse-silence-error-when-we-find-no-memlimit.patch
@@ -0,0 +1,29 @@
+From 607a79df39bbe1e4b3e09dc54c0388ed6140cf7b Mon Sep 17 00:00:00 2001
+From: Wolfgang Bumiller <w.bumiller@proxmox.com>
+Date: Fri, 24 Apr 2020 09:17:06 +0200
+Subject: [PATCH lxcfs] proc_fuse: silence error when we find no memlimit
+
+We get a positive result with an empty string if we do not
+encounter any limits while walking up the cgroup.
+
+Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
+---
+ src/proc_fuse.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/proc_fuse.c b/src/proc_fuse.c
+index b2edf76..ae06bff 100644
+--- a/src/proc_fuse.c
++++ b/src/proc_fuse.c
+@@ -210,7 +210,7 @@ static uint64_t get_memlimit(const char *cgroup, bool swap)
+               ret = cgroup_ops->get_memory_swap_max(cgroup_ops, cgroup, &memlimit_str);
+       else
+               ret = cgroup_ops->get_memory_max(cgroup_ops, cgroup, &memlimit_str);
+-      if (ret > 0 && safe_uint64(memlimit_str, &memlimit, 10) < 0)
++      if (ret > 0 && memlimit_str[0] && safe_uint64(memlimit_str, &memlimit, 10) < 0)
+               lxcfs_error("Failed to convert memlimit %s", memlimit_str);
+ 
+       return memlimit;
+-- 
+2.20.1
+

diff --git a/debian/patches/series b/debian/patches/series
index bf650b42b1037ca3c7f99c19421c9e1728402554..efb74634001dd7fdbe67f5497ce6795714ffc351 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 do-not-start-without-lxcfs.patch
+extra/0001-proc_fuse-silence-error-when-we-find-no-memlimit.patch