containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6200 from haircommander/skip-unified 

cgroup: skip unified if we are using v1
This commit is contained in:
OpenShift Merge Robot 2020-05-13 03:23:11 -07:00 committed by GitHub
parent c46ba9905f f4b59c74a7
commit d147b3ee02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cgroups/cgroups.go
View File

@ -517,6 +517,10 @@ func (c *CgroupControl) AddPid(pid int) error {
} }
for _, n := range names { 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") p := filepath.Join(c.getCgroupv1Path(n), "tasks")
if err := ioutil.WriteFile(p, pidString, 0644); err != nil { if err := ioutil.WriteFile(p, pidString, 0644); err != nil {
return errors.Wrapf(err, "write %s", p) return errors.Wrapf(err, "write %s", p)