diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-02-27 15:01:29 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-03-01 21:17:51 +0000 |
| commit | f02a9cd97547630a944df83e7e02eac11e8a7021 (patch) | |
| tree | c026b7a52ebd1998d979abab11d1f526cf1a76fa /libpod/runtime_ctr.go | |
| parent | 70baafc1c756ba4ebc25c54ac92763bf0b8e91bb (diff) | |
| download | podman-f02a9cd97547630a944df83e7e02eac11e8a7021.tar.gz podman-f02a9cd97547630a944df83e7e02eac11e8a7021.tar.bz2 podman-f02a9cd97547630a944df83e7e02eac11e8a7021.zip | |
Handle removing containers with active exec sessions
For containers without --force set, an error will be returned
For containers with --force, all pids in the container will be
stopped, first with SIGTERM and then with SIGKILL after a timeout
(this mimics the behavior of stopping a container).
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Closes: #412
Approved by: baude
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 4f8587186..51c2001d0 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -165,6 +165,17 @@ func (r *Runtime) removeContainer(c *Container, force bool) error { return errors.Wrapf(ErrCtrStateInvalid, "cannot remove container %s as it is %s - running or paused containers cannot be removed", c.ID(), c.state.State.String()) } + // Check that all of our exec sessions have finished + if len(c.state.ExecSessions) != 0 { + if force { + if err := r.ociRuntime.execStopContainer(c, c.StopTimeout()); err != nil { + return err + } + } else { + return errors.Wrapf(ErrCtrStateInvalid, "cannot remove container %s as it has active exec sessions", c.ID()) + } + } + // Check that no other containers depend on the container deps, err := r.state.ContainerInUse(c) if err != nil { |