openstack/cinder
Code Issues Proposed changes

Merge "Fix to allow RBD delete an unprotected snapshot"

Browse Source
This commit is contained in:
Jenkins 2015-12-29 00:04:30 +00:00 committed by Gerrit Code Review
commit 49507b61cb
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cinder/tests/unit/test_rbd.py
View File

@ -83,6 +83,7 @@ def common_mocks(f):
inst.mock_rbd.ImageBusy = MockImageBusyException
inst.mock_rbd.ImageNotFound = MockImageNotFoundException
inst.mock_rbd.ImageExists = MockImageExistsException
inst.mock_rbd.InvalidArgument = MockImageNotFoundException
inst.driver.rbd = inst.mock_rbd
inst.driver.rados = inst.mock_rados
@ -385,6 +386,16 @@ class RBDTestCase(test.TestCase):
proxy.remove_snap.assert_called_with(self.snapshot_name)
proxy.unprotect_snap.assert_called_with(self.snapshot_name)
@common_mocks
def test_delete_unprotected_snapshot(self):
proxy = self.mock_proxy.return_value
proxy.__enter__.return_value = proxy
proxy.unprotect_snap.side_effect = self.mock_rbd.InvalidArgument
self.driver.delete_snapshot(self.snapshot)
self.assertTrue(proxy.unprotect_snap.called)
self.assertTrue(proxy.remove_snap.called)
@common_mocks
def test_delete_busy_snapshot(self):
proxy = self.mock_proxy.return_value

2
cinder/volume/drivers/rbd.py
View File

@ -749,6 +749,8 @@ class RBDDriver(driver.TransferVD, driver.ExtendVD,
with RBDVolumeProxy(self, volume_name) as volume:
try:
volume.unprotect_snap(snap_name)
except self.rbd.InvalidArgument:
LOG.info(_LI("Unable to unprotect snapshot %s."), snap_name)
except self.rbd.ImageNotFound:
LOG.info(_LI("Snapshot %s does not exist in backend."),
snap_name)