diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-11 21:23:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-11 21:23:29 +0200 |
| commit | e06561270105a4e801eddce6ffe3d52f8bf23ed6 (patch) | |
| tree | 700a8e0b1738acae47a9b1ef2c5862f7ee267278 /pkg/cgroups/memory.go | |
| parent | 6db27454061f6a96409aa2e3fbe5e2754adc663e (diff) | |
| parent | 7b75796a6056e5ef65518c37008a1176417d2797 (diff) | |
| download | podman-e06561270105a4e801eddce6ffe3d52f8bf23ed6.tar.gz podman-e06561270105a4e801eddce6ffe3d52f8bf23ed6.tar.bz2 podman-e06561270105a4e801eddce6ffe3d52f8bf23ed6.zip | |
Merge pull request #3554 from giuseppe/fix-cgroupfs-cleanup
cgroups: fix a leak when using cgroupfs
Diffstat (limited to 'pkg/cgroups/memory.go')
| -rw-r--r-- | pkg/cgroups/memory.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/cgroups/memory.go b/pkg/cgroups/memory.go index 80e88d17c..b3991f7e3 100644 --- a/pkg/cgroups/memory.go +++ b/pkg/cgroups/memory.go @@ -2,7 +2,6 @@ package cgroups import ( "fmt" - "os" "path/filepath" spec "github.com/opencontainers/runtime-spec/specs-go" @@ -33,7 +32,7 @@ func (c *memHandler) Create(ctr *CgroupControl) (bool, error) { // Destroy the cgroup func (c *memHandler) Destroy(ctr *CgroupControl) error { - return os.Remove(ctr.getCgroupv1Path(Memory)) + return rmDirRecursively(ctr.getCgroupv1Path(Memory)) } // Stat fills a metrics structure with usage stats for the controller |