瀏覽代碼

devmapper: Do not add back device into hash map if meta file removal failed

When we are deleting a device, we also delete associated metadata file. If
that file removal fails, we are adding back the device in in-memory
table. I really can't see what's the point. When next lookup takes place
it will be automatically loaded if need be. Remove that code.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Vivek Goyal 10 年之前
父節點
當前提交
5be77901cd
共有 1 個文件被更改,包括 0 次插入3 次删除
  1. 0 3
      daemon/graphdriver/devmapper/deviceset.go

+ 0 - 3
daemon/graphdriver/devmapper/deviceset.go

@@ -814,9 +814,6 @@ func (devices *DeviceSet) deleteDevice(info *DevInfo) error {
 	devices.devicesLock.Unlock()
 	devices.devicesLock.Unlock()
 
 
 	if err := devices.removeMetadata(info); err != nil {
 	if err := devices.removeMetadata(info); err != nil {
-		devices.devicesLock.Lock()
-		devices.Devices[info.Hash] = info
-		devices.devicesLock.Unlock()
 		log.Debugf("Error removing meta data: %s", err)
 		log.Debugf("Error removing meta data: %s", err)
 		return err
 		return err
 	}
 	}