summaryrefslogtreecommitdiff
path: root/libpod/define/errors.go
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2020-06-08 13:34:12 -0400
committerMatthew Heon <mheon@redhat.com>2020-06-08 13:48:29 -0400
commit9d964ffb9fc98ed13f6fec974c917b84c175d39a (patch)
treed8865dd121fb910363c17c11e6822811388562d1 /libpod/define/errors.go
parentb8acc851bb472c7ea9674bf1bf8ca3812ff2ab24 (diff)
downloadpodman-9d964ffb9fc98ed13f6fec974c917b84c175d39a.tar.gz
podman-9d964ffb9fc98ed13f6fec974c917b84c175d39a.tar.bz2
podman-9d964ffb9fc98ed13f6fec974c917b84c175d39a.zip
Ensure Conmon is alive before waiting for exit file
This came out of a conversation with Valentin about systemd-managed Podman. He discovered that unit files did not properly handle cases where Conmon was dead - the ExecStopPost `podman rm --force` line was not actually removing the container, but interestingly, adding a `podman cleanup --rm` line would remove it. Both of these commands do the same thing (minus the `podman cleanup --rm` command not force-removing running containers). Without a running Conmon instance, the container process is still running (assuming you killed Conmon with SIGKILL and it had no chance to kill the container it managed), but you can still kill the container itself with `podman stop` - Conmon is not involved, only the OCI Runtime. (`podman rm --force` and `podman stop` use the same code to kill the container). The problem comes when we want to get the container's exit code - we expect Conmon to make us an exit file, which it's obviously not going to do, being dead. The first `podman rm` would fail because of this, but importantly, it would (after failing to retrieve the exit code correctly) set container status to Exited, so that the second `podman cleanup` process would succeed. To make sure the first `podman rm --force` succeeds, we need to catch the case where Conmon is already dead, and instead of waiting for an exit file that will never come, immediately set the Stopped state and remove an error that can be caught and handled. Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'libpod/define/errors.go')
-rw-r--r--libpod/define/errors.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/libpod/define/errors.go b/libpod/define/errors.go
index 16df2a1cc..083553b7e 100644
--- a/libpod/define/errors.go
+++ b/libpod/define/errors.go
@@ -141,6 +141,9 @@ var (
// ErrConmonOutdated indicates the version of conmon found (whether via the configuration or $PATH)
// is out of date for the current podman version
ErrConmonOutdated = errors.New("outdated conmon version")
+ // ErrConmonDead indicates that the container's conmon process has been
+ // killed, preventing normal operation.
+ ErrConmonDead = errors.New("conmon process killed")
// ErrImageInUse indicates the requested operation failed because the image was in use
ErrImageInUse = errors.New("image is being used")