diff options
| author | haircommander <pehunt@redhat.com> | 2018-08-20 17:56:35 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-23 18:16:28 +0000 |
| commit | 0e6266858a913ac36de0726ede10d5d03af533e3 (patch) | |
| tree | 152c7b8b029d5eb80c6caf466c9d0ab1b0ef3913 /libpod/runtime_pod.go | |
| parent | 2a7449362f2884d9ae6a783c0ce38979d882e2cf (diff) | |
| download | podman-0e6266858a913ac36de0726ede10d5d03af533e3.tar.gz podman-0e6266858a913ac36de0726ede10d5d03af533e3.tar.bz2 podman-0e6266858a913ac36de0726ede10d5d03af533e3.zip | |
Fixing network ns segfault
As well as small style corrections, update pod_top_test to use CreatePod, and move handling of adding a container to the pod's namespace from container_internal_linux to libpod/option.
Signed-off-by: haircommander <pehunt@redhat.com>
Closes: #1187
Approved by: mheon
Diffstat (limited to 'libpod/runtime_pod.go')
| -rw-r--r-- | libpod/runtime_pod.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libpod/runtime_pod.go b/libpod/runtime_pod.go index 19e32d1b0..b3dd7dabd 100644 --- a/libpod/runtime_pod.go +++ b/libpod/runtime_pod.go @@ -33,6 +33,14 @@ func (r *Runtime) RemovePod(ctx context.Context, p *Pod, removeCtrs, force bool) return ErrRuntimeStopped } + if !p.valid { + if ok, _ := r.state.HasPod(p.ID()); !ok { + // Pod probably already removed + // Or was never in the runtime to begin with + return nil + } + } + p.lock.Lock() defer p.lock.Unlock() |