From 1260e7fd4cc68d7d6a709b730063893213a215a1 Mon Sep 17 00:00:00 2001 From: Nikolay Sivko Date: Fri, 14 Feb 2025 20:42:17 +0300 Subject: [PATCH] enhance accuracy of cgroup2 base path detection --- cgroup/cgroup_linux.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cgroup/cgroup_linux.go b/cgroup/cgroup_linux.go index d60e8d3..86c90a6 100644 --- a/cgroup/cgroup_linux.go +++ b/cgroup/cgroup_linux.go @@ -4,6 +4,7 @@ import ( "os" "path" "runtime" + "strings" "github.com/vishvananda/netns" "golang.org/x/sys/unix" @@ -38,7 +39,14 @@ func Init() error { } } if _, err := os.Stat(path.Join(cgRoot, "unified")); err == nil { - cg2Root = path.Join(cgRoot, "unified") + if data, err := os.ReadFile("/proc/self/mounts"); err == nil { + for _, line := range strings.Split(string(data), "\n") { + if strings.Contains(line, "cgroup/unified") { + cg2Root = path.Join(cgRoot, "unified") + break + } + } + } } klog.Infoln("cgroup v2 root is", cg2Root) return nil