diff options
author | Matthew Heon <mheon@redhat.com> | 2020-12-02 10:05:34 -0500 |
---|---|---|
committer | Matthew Heon <mheon@redhat.com> | 2020-12-02 14:18:37 -0500 |
commit | ab886328357184cd0a8375a5dedf816ba91789f9 (patch) | |
tree | 3d1d5f58931ab6c6c1f0a5a74b3e263e616d64ee /libpod/reset.go | |
parent | ce45b71dcfe7e5e0fd7ab43b9eeb4834317e6443 (diff) | |
download | podman-ab886328357184cd0a8375a5dedf816ba91789f9.tar.gz podman-ab886328357184cd0a8375a5dedf816ba91789f9.tar.bz2 podman-ab886328357184cd0a8375a5dedf816ba91789f9.zip |
Use Libpod tmpdir for pause path
Previously, we always computed pause path from the Rootless
runtime directory. Problem: this does not match the behavior of
Libpod when the directory changes. Libpod will continue to use
the previous directory, cached in the database; Pause pidfiles
will swap to the new path. This is problematic when the directory
needs to exist to write the pidfile, and Libpod is what creates
the directory.
There are two potential solutions - allow the pause pidfile to
move and just make the directory when we want to write it, or use
the cached Libpod paths for a guaranteed location. This patch
does the second, because it seems safer - we will never miss a
previously-existing pidfile because the location is now
consistent.
Fixes #8539
Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'libpod/reset.go')
-rw-r--r-- | libpod/reset.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/reset.go b/libpod/reset.go index f8828fed4..6d2842723 100644 --- a/libpod/reset.go +++ b/libpod/reset.go @@ -46,7 +46,7 @@ func (r *Runtime) Reset(ctx context.Context) error { } } - if err := stopPauseProcess(); err != nil { + if err := r.stopPauseProcess(); err != nil { logrus.Errorf("Error stopping pause process: %v", err) } |