diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-04-11 09:51:26 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-04-11 11:05:00 -0400 |
| commit | 27d56c7f1531be9c82b3b81429048aa01e2b1248 (patch) | |
| tree | 4845e10d033d98e21d930ccac1fb0e25642d6b31 /libpod/runtime_ctr.go | |
| parent | 638789fd88f60839bd65cad3bc28f0c698d41e32 (diff) | |
| download | podman-27d56c7f1531be9c82b3b81429048aa01e2b1248.tar.gz podman-27d56c7f1531be9c82b3b81429048aa01e2b1248.tar.bz2 podman-27d56c7f1531be9c82b3b81429048aa01e2b1248.zip | |
Expand debugging for container cleanup errors
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 800b42851..85b860268 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -372,7 +372,7 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool, // Clean up network namespace, cgroups, mounts if err := c.cleanup(ctx); err != nil { if cleanupErr == nil { - cleanupErr = err + cleanupErr = errors.Wrapf(err, "error cleaning up container %s", c.ID()) } else { logrus.Errorf("cleanup network, cgroups, mounts: %v", err) } @@ -404,12 +404,14 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool, // Deallocate the container's lock if err := c.lock.Free(); err != nil { if cleanupErr == nil { - cleanupErr = err + cleanupErr = errors.Wrapf(err, "error freeing lock for container %s", c.ID()) } else { logrus.Errorf("free container lock: %v", err) } } + c.newContainerEvent(events.Remove) + if !removeVolume { return cleanupErr } @@ -425,7 +427,6 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool, } } - c.newContainerEvent(events.Remove) return cleanupErr } |