diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-22 18:59:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 18:59:30 +0100 |
| commit | e3a7a743c50f7131fde98380b8059c463468c653 (patch) | |
| tree | 3f1a1b54bbce0126b534f1bc2c369e54f96253ff /utils/utils_supported.go | |
| parent | 72031783c5152cc715a8f1b6dc39bb5de8bfc3ca (diff) | |
| parent | fe30b30458098c2d4f97e3cf5513870a6bac8e06 (diff) | |
| download | podman-e3a7a743c50f7131fde98380b8059c463468c653.tar.gz podman-e3a7a743c50f7131fde98380b8059c463468c653.tar.bz2 podman-e3a7a743c50f7131fde98380b8059c463468c653.zip | |
Merge pull request #12383 from edsantiago/flake_fixes
[v3.4] backport Flake fixes
Diffstat (limited to 'utils/utils_supported.go')
| -rw-r--r-- | utils/utils_supported.go | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/utils/utils_supported.go b/utils/utils_supported.go index 1404e3194..0f0c9a9ba 100644 --- a/utils/utils_supported.go +++ b/utils/utils_supported.go @@ -44,15 +44,6 @@ func RunUnderSystemdScope(pid int, slice string, unitName string) error { ch := make(chan string) _, err = conn.StartTransientUnit(unitName, "replace", properties, ch) 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 } |