diff options
| -rw-r--r-- | libpod/oci.go | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/libpod/oci.go b/libpod/oci.go index 049d0817b..b59525de7 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -467,6 +467,15 @@ func (r *OCIRuntime) stopContainer(ctr *Container, timeout uint) error { if timeout > 0 { if err := r.killContainer(ctr, stopSignal); err != nil { + // Is the container gone? + // If so, it probably died between the first check and + // our sending the signal + // The container is stopped, so exit cleanly + err := unix.Kill(ctr.state.PID, 0) + if err == unix.ESRCH { + return nil + } + return err } @@ -479,6 +488,12 @@ func (r *OCIRuntime) stopContainer(ctr *Container, timeout uint) error { } if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.path, "kill", "--all", ctr.ID(), "KILL"); err != nil { + // Again, check if the container is gone. If it is, exit cleanly. + err := unix.Kill(ctr.state.PID, 0) + if err == unix.ESRCH { + return nil + } + return errors.Wrapf(err, "error sending SIGKILL to container %s", ctr.ID()) } |