Merge pull request #9464 from giuseppe/fix-cgroupv1-stats

cgroup: change cgroup deletion logic on v1

1 files changed, 15 insertions, 9 deletions

diff --git a/pkg/cgroups/cgroups.go b/pkg/cgroups/cgroups.go
index f563c51a8..608e1647a 100644
--- a/pkg/cgroups/cgroups.go
+++ b/pkg/cgroups/cgroups.go
@@ -331,18 +331,24 @@ func Load(path string) (*CgroupControl, error) {
 		control.additionalControllers = controllers
 	}
 	if !cgroup2 {
+		oneExists := false
+		// check that the cgroup exists at least under one controller
 		for name := range handlers {
 			p := control.getCgroupv1Path(name)
-			if _, err := os.Stat(p); err != nil {
-				if os.IsNotExist(err) {
-					if rootless.IsRootless() {
-						return nil, ErrCgroupV1Rootless
-					}
-					// compatible with the error code
-					// used by containerd/cgroups
-					return nil, ErrCgroupDeleted
-				}
+			if _, err := os.Stat(p); err == nil {
+				oneExists = true
+				break
+			}
+		}
+
+		// if there is no controller at all, raise an error
+		if !oneExists {
+			if rootless.IsRootless() {
+				return nil, ErrCgroupV1Rootless
 			}
+			// compatible with the error code
+			// used by containerd/cgroups
+			return nil, ErrCgroupDeleted
 		}
 	}
 	return control, nil