summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-05-09 17:37:31 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-05-11 14:43:57 +0000
commit177c27e75dccdc64f488c240948ad6de88383a29 (patch)
treeba54b0da196a09098ddbfc52a6b9ec2e2820a256
parentc4c5c1a3e191348491299aa2d53397879da0854d (diff)
downloadpodman-177c27e75dccdc64f488c240948ad6de88383a29.tar.gz
podman-177c27e75dccdc64f488c240948ad6de88383a29.tar.bz2
podman-177c27e75dccdc64f488c240948ad6de88383a29.zip
Do not error trying to remove cgroups that don't exist
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #507 Approved by: baude
-rw-r--r--libpod/container_internal.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 21ddf9cbb..cbf2a61b8 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -736,6 +736,12 @@ func (c *Container) cleanupCgroups() error {
cgroup, err := cgroups.Load(cgroups.V1, cgroups.StaticPath(path))
if err != nil {
+ // It's fine for the cgroup to not exist
+ // We want it gone, it's gone
+ if err == cgroups.ErrCgroupDeleted {
+ return nil
+ }
+
return err
}