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

Merge pull request #12538 from giuseppe/fix-12535 

utils: reintroduce moveToCgroup
This commit is contained in:
OpenShift Merge Robot 2021-12-08 11:44:14 +00:00 committed by GitHub
parent 3b21ba2f62 0999245e40
commit 31be3a9f24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
utils/utils_supported.go
View File

@ -44,6 +44,15 @@ func RunUnderSystemdScope(pid int, slice string, unitName string) error {
ch := make(chan string) ch := make(chan string)
_, err = conn.StartTransientUnit(unitName, "replace", properties, ch) _, err = conn.StartTransientUnit(unitName, "replace", properties, ch)
if err != nil { if err != nil {
// On errors check if the cgroup already exists, if it does move the process there
if props, err := conn.GetUnitTypeProperties(unitName, "Scope"); err == nil {
if cgroup, ok := props["ControlGroup"].(string); ok && cgroup != "" {
if err := moveUnderCgroup(cgroup, "", []uint32{uint32(pid)}); err == nil {
return nil
}
// On errors return the original error message we got from StartTransientUnit.
}
}
return err return err
} }