openstack
/
cinder
Code Issues Proposed changes

RBD: fix volume reference handling in clone logic 

This patch fixes a bug in volume cloning where the source volume is
prematurely closed.  If the destination volume requires flattening and
an exception occurs during flattening, the code attempts to perform
cleanup operations on an already closed volume.  This resulted in a
segmentation fault which causes cinder to restart.

Co-authored-by: Jon Bernard <jobernar@redhat.com>

Change-Id: Ib713aa91b775d8ec07ffdb24dfe1db1b6ecf2921
Closes-Bug: #1794956
(cherry picked from commit 394fbd7e20)
(cherry picked from commit 7bfd3c4dcf)
(cherry picked from commit 47caae4cbb)
This commit is contained in:
zhu.boxiang 2018-09-28 19:07:12 +08:00 committed by Brian Rosmaita
parent fda8a8f86d
commit 5d62c72d35
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -931,10 +931,13 @@ class RBDTestCase(test.TestCase):
(self.mock_rbd.Image.return_value.protect_snap
.assert_called_once_with('.'.join(
(self.volume_b.name, 'clone_snap'))))
# We expect clone() to be called exactly once.
self.assertEqual(
1, self.mock_rbd.RBD.return_value.clone.call_count)
# Without flattening, only the source volume is opened,
# so only one call to close() should occur.
self.assertEqual(
2, self.mock_rbd.Image.return_value.close.call_count)
1, self.mock_rbd.Image.return_value.close.call_count)
self.assertTrue(mock_get_clone_depth.called)
mock_resize.assert_not_called()
mock_enable_repl.assert_not_called()
@ -970,7 +973,7 @@ class RBDTestCase(test.TestCase):
image.protect_snap.assert_called_once_with(name + '.clone_snap')
self.assertEqual(1, self.mock_rbd.RBD.return_value.clone.call_count)
self.assertEqual(
2, self.mock_rbd.Image.return_value.close.call_count)
1, self.mock_rbd.Image.return_value.close.call_count)
mock_get_clone_depth.assert_called_once_with(
self.mock_client().__enter__(), self.volume_a.name)
mock_resize.assert_not_called()
@ -1000,7 +1003,7 @@ class RBDTestCase(test.TestCase):
self.assertEqual(
1, self.mock_rbd.RBD.return_value.clone.call_count)
self.assertEqual(
2, self.mock_rbd.Image.return_value.close.call_count)
1, self.mock_rbd.Image.return_value.close.call_count)
self.assertTrue(mock_get_clone_depth.called)
self.assertEqual(
1, mock_resize.call_count)
@ -1057,7 +1060,7 @@ class RBDTestCase(test.TestCase):
# We expect the driver to close both volumes, so 2 is expected
self.assertEqual(
3, self.mock_rbd.Image.return_value.close.call_count)
2, self.mock_rbd.Image.return_value.close.call_count)
self.assertTrue(mock_get_clone_depth.called)
mock_enable_repl.assert_not_called()

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

@ -610,6 +610,7 @@ class RBDDriver(driver.CloneableImageVD, driver.MigrateVD,
except Exception as e:
src_volume.unprotect_snap(clone_snap)
src_volume.remove_snap(clone_snap)
src_volume.close()
msg = (_("Failed to clone '%(src_vol)s@%(src_snap)s' to "
"'%(dest)s', error: %(error)s") %
{'src_vol': src_name,
@ -618,8 +619,6 @@ class RBDDriver(driver.CloneableImageVD, driver.MigrateVD,
'error': e})
LOG.exception(msg)
raise exception.VolumeBackendAPIException(data=msg)
finally:
src_volume.close()
depth = self._get_clone_depth(client, src_name)
# If dest volume is a clone and rbd_max_clone_depth reached,