openstack
/
cinder
Code Issues Proposed changes

Do not fail if RBD image is broken 

Change-Id: I78e552998e822fff37fb2c7cf890ebab65d9291f
Closes-Bug: #1698786
(cherry picked from commit 3e7b9ba546)
This commit is contained in:
Ivan Kolodyazhny 2017-06-19 17:17:04 +03:00 committed by Anton Arefiev
parent 7128bb8b78
commit 225618bf0c
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1788,6 +1788,33 @@ class RBDTestCase(test.TestCase):
self.assertEqual(RAISED_EXCEPTIONS,
[self.mock_rbd.ImageExists])
@ddt.data({'image_size': [1, 1], 'total_usage': 2},
{'image_size': MockImageNotFoundException, 'total_usage': 0})
@ddt.unpack
@mock.patch.object(driver, 'RADOSClient')
@mock.patch.object(driver, 'RBDVolumeProxy')
def test__get_usage_info(self, volume_proxy, mock_rados_client,
image_size, total_usage):
class FakeRBDProxy(object):
def list(self, ioctx):
return ['volume-1', 'volume-2']
def diff_iterate(offset, length, from_snapshot, iterate_cb):
self.driver._iterate_cb(offset, length, True)
self.driver._total_usage = 0
with mock.patch.object(self.driver, 'RBDProxy') as rbd_proxy:
with mock.patch.object(self.driver, 'rbd') as mock_rbd:
mock_rbd.ImageNotFound = MockImageNotFoundException
proxy_list = mock.Mock()
proxy_list.side_effect = ['volume-1', 'volume-2']
rbd_proxy.return_value = FakeRBDProxy()
image = volume_proxy.return_value.__enter__.return_value
image.size.side_effect = image_size
image.diff_iterate.side_effect = diff_iterate
self.driver._get_usage_info()
self.assertEqual(total_usage, self.driver._total_usage)
class ManagedRBDTestCase(test_driver.BaseDriverTestCase):
driver_name = "cinder.volume.drivers.rbd.RBDDriver"

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

@ -371,8 +371,11 @@ class RBDDriver(driver.CloneableImageVD,
# Only check for "volume" to allow some flexibility with
# non-default volume_name_template settings. Template
# must start with "volume".
with RBDVolumeProxy(self, t, read_only=True) as v:
v.diff_iterate(0, v.size(), None, self._iterate_cb)
try:
with RBDVolumeProxy(self, t, read_only=True) as v:
v.diff_iterate(0, v.size(), None, self._iterate_cb)
except self.rbd.ImageNotFound:
LOG.debug("Image %s is not found.", t)
def _update_volume_stats(self):
stats = {