diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-06-19 07:50:30 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-29 14:32:57 +0000 |
| commit | 3a90b5224df686e6efbf78e6b6cbb5333115ea82 (patch) | |
| tree | e3413c7892446f8c17d6d2a2abd0ce9cba37a902 /libpod/runtime_ctr.go | |
| parent | 810f2b6061c710a15aaee46c758e71ea9a2920fa (diff) | |
| download | podman-3a90b5224df686e6efbf78e6b6cbb5333115ea82.tar.gz podman-3a90b5224df686e6efbf78e6b6cbb5333115ea82.tar.bz2 podman-3a90b5224df686e6efbf78e6b6cbb5333115ea82.zip | |
Returning joining namespace error should not be fatal
I got my database state in a bad way by killing a hanging container.
It did not setup the network namespace correctly
listing/remove bad containers becomes impossible.
podman run alpine/nginx
^c
got me in this state.
I got into a state in the database where
podman ps -a
was returning errors and I could not get out of it, Makeing joining the network
namespace a non fatal error fixes the issue.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #918
Approved by: mheon
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 932bebdef..82a2fed19 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -165,9 +165,11 @@ func (r *Runtime) RemoveContainer(ctx context.Context, c *Container, force bool) // Locks the container, but does not lock the runtime func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool) error { if !c.valid { - // Container probably already removed - // Or was never in the runtime to begin with - return nil + if ok, _ := r.HasContainer(c.ID()); !ok { + // Container probably already removed + // Or was never in the runtime to begin with + return nil + } } // We need to lock the pod before we lock the container |