clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-04 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve aufs cleanup and debugging

Browse Source
This commit is contained in:
Victor Vieux
2013-11-19 17:12:37 -08:00
parent f6629bbbd5
commit 43899a77bf
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphdriver/aufs/aufs.go
+6 -3
View File
@@ -182,14 +182,17 @@ func (a *AufsDriver) Remove(id string) error {
return err
}
realPath := path.Join(a.rootPath(), p, id)
if err := os.Rename(realPath, tmp); err != nil {
if err := os.Rename(realPath, tmp); err != nil && !os.IsNotExist(err) {
return err
}
defer os.RemoveAll(tmp)
}
// Remove the layers file for the id
return os.Remove(path.Join(a.rootPath(), "layers", id))
if err := os.Remove(path.Join(a.rootPath(), "layers", id)); err != nil && !os.IsNotExist(err) {
return err
}
return nil
}
// Return the rootfs path for the id
@@ -300,7 +303,7 @@ func (a *AufsDriver) Cleanup() error {
}
for _, id := range ids {
if err := a.unmount(id); err != nil {
return err
utils.Errorf("Unmounting %s: %s", utils.TruncateID(id), err)
}
}
return nil