diff options
| -rw-r--r-- | cmd/podman/rm.go | 10 | ||||
| -rw-r--r-- | completions/bash/podman | 1 | ||||
| -rw-r--r-- | docs/podman-rm.1.md | 7 | ||||
| -rw-r--r-- | libpod/container_api.go | 22 |
4 files changed, 29 insertions, 11 deletions
diff --git a/cmd/podman/rm.go b/cmd/podman/rm.go index 7c0569b78..224df4543 100644 --- a/cmd/podman/rm.go +++ b/cmd/podman/rm.go @@ -21,6 +21,10 @@ var ( }, LatestFlag, cli.BoolFlag{ + Name: "sync", + Usage: "Sync container state with OCI runtime before removing", + }, + cli.BoolFlag{ Name: "volumes, v", Usage: "Remove the volumes associated with the container (Not implemented yet)", }, @@ -73,6 +77,12 @@ func rmCmd(c *cli.Context) error { for _, container := range delContainers { con := container f := func() error { + if c.Bool("sync") { + if err := con.Sync(); err != nil { + return err + } + } + return runtime.RemoveContainer(ctx, con, c.Bool("force")) } diff --git a/completions/bash/podman b/completions/bash/podman index 9518cfa22..21d35949d 100644 --- a/completions/bash/podman +++ b/completions/bash/podman @@ -1828,6 +1828,7 @@ _podman_rm() { -h --latest -l + --sync --volumes -v " diff --git a/docs/podman-rm.1.md b/docs/podman-rm.1.md index 56664a8c1..7f22113ea 100644 --- a/docs/podman-rm.1.md +++ b/docs/podman-rm.1.md @@ -24,6 +24,13 @@ Remove all containers. Can be used in conjunction with -f as well. Instead of providing the container name or ID, use the last created container. If you use methods other than Podman to run containers such as CRI-O, the last started container could be from either of those methods. +**--sync** + +Force a sync of container state with the OCI runtime before attempting to remove. +In some cases, a container's state in the runtime can become out of sync with Podman's state, +which can cause Podman to refuse to remove containers because it believes they are still running. +A sync will resolve this issue. + **--volumes, -v** Remove the volumes associated with the container. (Not yet implemented) diff --git a/libpod/container_api.go b/libpod/container_api.go index bc92cae69..ee060ad6a 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -675,22 +675,22 @@ func (c *Container) Batch(batchFunc func(*Container) error) error { return err } -// Sync updates the current state of the container, checking whether its state -// has changed -// Sync can only be used inside Batch() - otherwise, it will be done -// automatically. -// When called outside Batch(), Sync() is a no-op +// Sync updates the status of a container by querying the OCI runtime. +// If the container has not been created inside the OCI runtime, nothing will be +// done. +// Most of the time, Podman does not explicitly query the OCI runtime for +// container status, and instead relies upon exit files created by conmon. +// This can cause a disconnect between running state and what Podman sees in +// cases where Conmon was killed unexpected, or runc was upgraded. +// Running a manual Sync() ensures that container state will be correct in +// such situations. func (c *Container) Sync() error { - if !c.batched { - return nil - } - // If runtime knows about the container, update its status in runtime // And then save back to disk if (c.state.State != ContainerStateUnknown) && - (c.state.State != ContainerStateConfigured) { + (c.state.State != ContainerStateConfigured) && + (c.state.State != ContainerStateExited) { oldState := c.state.State - // TODO: optionally replace this with a stat for the exit file if err := c.runtime.ociRuntime.updateContainerStatus(c, true); err != nil { return err } |