openstack
/
cinder
Code Issues Proposed changes

VMware: Fix volume cascade delete 

VMDK driver does not allow snapshot deletion if the volume
is attached. Currently we assume the volume to be attached
if it's state is not 'available', which is wrong. During
cascade delete, the volume status is set to 'deleting'.
Therefore, snapshot deletion fails even if the volume is
not attached. Fixing this by using volume attachment info
to check for attached volumes.

Change-Id: I83874d6d287fe3950b003f7eac74db9a1602432e
Closes-bug: #1701393
This commit is contained in:
Vipin Balachandran 2017-06-29 16:35:27 -07:00
parent aedb0048d8
commit c4cc7df0bd
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cinder/tests/unit/volume/drivers/vmware/test_vmware_vmdk.py
View File

@ -273,28 +273,32 @@ class VMwareVcVmdkDriverTestCase(test.TestCase):
vops.delete_snapshot.assert_not_called()
@mock.patch.object(VMDK_DRIVER, 'volumeops')
def test_delete_snapshot_with_backing(self, vops):
@mock.patch.object(VMDK_DRIVER, '_in_use', return_value=False)
def test_delete_snapshot_with_backing(self, in_use, vops):
backing = mock.sentinel.backing
vops.get_backing.return_value = backing
volume = self._create_volume_dict()
volume = self._create_volume_dict(status='deleting')
snapshot = fake_snapshot.fake_snapshot_obj(self._context,
volume=volume)
self._driver.delete_snapshot(snapshot)
vops.get_backing.assert_called_once_with(snapshot.volume_name)
vops.get_snapshot.assert_called_once_with(backing, snapshot.name)
in_use.assert_called_once_with(snapshot.volume)
vops.delete_snapshot.assert_called_once_with(
backing, snapshot.name)
@mock.patch.object(VMDK_DRIVER, 'volumeops')
def test_delete_snapshot_when_attached(self, vops):
@mock.patch.object(VMDK_DRIVER, '_in_use', return_value=True)
def test_delete_snapshot_when_attached(self, in_use, vops):
volume = self._create_volume_dict(status='in-use')
snapshot = fake_snapshot.fake_snapshot_obj(self._context,
volume=volume)
self.assertRaises(cinder_exceptions.InvalidSnapshot,
self._driver.delete_snapshot, snapshot)
in_use.assert_called_once_with(snapshot.volume)
@mock.patch.object(VMDK_DRIVER, 'volumeops')
def test_delete_snapshot_without_backend_snapshot(self, vops):

2
cinder/volume/drivers/vmware/vmdk.py
View File

@ -678,7 +678,7 @@ class VMwareVcVmdkDriver(driver.VolumeDriver):
resource=snapshot.volume)
elif not self.volumeops.get_snapshot(backing, snapshot.name):
LOG.debug("Snapshot does not exist in backend.", resource=snapshot)
elif snapshot.volume.status != 'available':
elif self._in_use(snapshot.volume):
msg = _("Delete snapshot of volume not supported in "
"state: %s.") % snapshot.volume.status
LOG.error(msg)