diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-11-17 10:06:26 +0100 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2021-11-22 08:25:10 -0700 |
| commit | 2d265da0ec6d88c0644d96c8077fe15b3ac64ea0 (patch) | |
| tree | ac32b0644858fde1f1cf7ea6f68e401ce1c88510 /utils/utils.go | |
| parent | 36b6bf119ed6c2a88bd40fb92fdbd7a30e7a0daa (diff) | |
| download | podman-2d265da0ec6d88c0644d96c8077fe15b3ac64ea0.tar.gz podman-2d265da0ec6d88c0644d96c8077fe15b3ac64ea0.tar.bz2 podman-2d265da0ec6d88c0644d96c8077fe15b3ac64ea0.zip | |
utils: use podman-pause-$RANDOM.scope name
[Backport of #12323 into v3.4, to fix gating-test flakes]
we try hard to re-use the existing podman-pause.scope name when it
already exists, causing any sort of race errors when the already
existing scope is terminating.
There is no such a requirement though, so just try with a random
name.
Closes: https://github.com/containers/podman/issues/12065
[NO NEW TESTS NEEDED] it fixes a race in the CI
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
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 { |