GitList

Browse code

Mark device ID free only if device actually got deleted

Right now if somebody has enabled deferred device deletion, then
deleteTransaction() returns success even if device could not be deleted. It
has been marked for deferred deletion. Right now we will mark device ID free
and potentially use it again when somebody tries to create new container. And
that's wrong. Device ID is not free yet. It will become free once devices
has actually been deleted by the goroutine later.

So move the location of call to markDeviceIDFree() to a place where we know
device actually got deleted and was not marked for deferred deletion.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>

Vivek Goyal authored on 2016/01/12 03:57:37
Showing 1 changed files

daemon/graphdriver/devmapper/deviceset.go

History View file @ 2dccb56

@@ -1801,6 +1801,7 @@ func (devices *DeviceSet) deleteTransaction(info *devInfo, syncDelete bool) erro
                      		if info.Deleted {
                      			devices.nrDeletedDevices--
+                     		}
                     +		devices.markDeviceIDFree(info.DeviceID)
                      	} else {
                      		if err := devices.markForDeferredDeletion(info); err != nil {
                      			return err
@@ -1855,8 +1856,6 @@ func (devices *DeviceSet) deleteDevice(info *devInfo, syncDelete bool) error {
                      		return err
+                     	}
                     -	devices.markDeviceIDFree(info.DeviceID)
+                    -
                      	return nil
+                     }