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.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.go')
| -rw-r--r-- | utils/utils.go | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/utils/utils.go b/utils/utils.go index 109ae088b..f2e7beef9 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -5,6 +5,7 @@ import ( "fmt" "io" "io/ioutil" + "math/rand" "os" "os/exec" "strconv" @@ -203,7 +204,16 @@ func moveProcessToScope(pidPath, slice, scope string) error { // MovePauseProcessToScope moves the pause process used for rootless mode to keep the namespaces alive to // a separate scope. func MovePauseProcessToScope(pausePidPath string) { - err := moveProcessToScope(pausePidPath, "user.slice", "podman-pause.scope") + var err error + + for i := 0; i < 3; i++ { + r := rand.Int() + err = moveProcessToScope(pausePidPath, "user.slice", fmt.Sprintf("podman-pause-%d.scope", r)) + if err == nil { + return + } + } + if err != nil { unified, err2 := cgroups.IsCgroup2UnifiedMode() if err2 != nil { |