Merge pull request #6200 from haircommander/skip-unified

cgroup: skip unified if we are using v1
2020-05-13 03:23:11 -07:00 · 2020-05-13 03:23:11 -07:00 · d147b3ee02
parent c46ba9905f f4b59c74a7
commit d147b3ee02
1 changed files with 4 additions and 0 deletions
--- a/pkg/cgroups/cgroups.go
+++ b/pkg/cgroups/cgroups.go
@ -517,6 +517,10 @@ func (c *CgroupControl) AddPid(pid int) error {
 	}

 	for _, n := range names {
+		// If we aren't using cgroup2, we won't write correctly to unified hierarchy
+		if !c.cgroup2 && n == "unified" {
+			continue
+		}
 		p := filepath.Join(c.getCgroupv1Path(n), "tasks")
 		if err := ioutil.WriteFile(p, pidString, 0644); err != nil {
 			return errors.Wrapf(err, "write %s", p)