docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4499 from alexlarsson/fix-remove-fail 

DeviceMapper: Succeed immediately when removing non-existant devices
This commit is contained in:
Guillaume J. Charmes 2014-03-11 10:09:58 -07:00
parent 6169dafab3 1cdd775f5d
commit af3ff044a2
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
graphdriver/devmapper/driver.go
View File

@ -90,6 +90,13 @@ func (d *Driver) Create(id, parent string) error {
} }
func (d *Driver) Remove(id string) error { func (d *Driver) Remove(id string) error {
if !d.DeviceSet.HasDevice(id) {
// Consider removing a non-existing device a no-op
// This is useful to be able to progress on container removal
// if the underlying device has gone away due to earlier errors
return nil
}
// Sink the float from create in case no Get() call was made // Sink the float from create in case no Get() call was made
if err := d.DeviceSet.UnmountDevice(id, UnmountSink); err != nil { if err := d.DeviceSet.UnmountDevice(id, UnmountSink); err != nil {
return err return err