openstack/cinder
Code Issues Proposed changes

Merge "DS8K: Correct create volume behavior for CG"

Browse Source
This commit is contained in:
Zuul 2018-02-21 14:29:42 +00:00 committed by Gerrit Code Review
commit 2298de4ced
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cinder/tests/unit/volume/drivers/ibm/test_ds8k_proxy.py
View File

@ -1486,6 +1486,30 @@ class DS8KProxyTest(test.TestCase):
TEST_VOLUME_ID,
ast.literal_eval(vol['provider_location'])['vol_hex_id'])
@mock.patch.object(helper.DS8KCommonHelper, '_create_lun')
def test_create_volume_for_cg_but_lss_full(self, mock_create_lun):
"""Just reserve one LSS for CG."""
self.configuration.lss_range_for_cg = '22'
self.driver = FakeDS8KProxy(self.storage_info, self.logger,
self.exception, self)
self.driver.setup(self.ctxt)
group_type = group_types.create(
self.ctxt,
'group',
{'consistent_group_snapshot_enabled': '<is> True'}
)
group = self._create_group(host=TEST_GROUP_HOST,
group_type_id=group_type.id)
vol_type = volume_types.create(self.ctxt, 'VOL_TYPE', {})
volume = self._create_volume(volume_type_id=vol_type.id,
group_id=group.id)
mock_create_lun.side_effect = [
restclient.LssFullException('LSS is full.'), TEST_VOLUME_ID]
self.assertRaises(exception.VolumeDriverException,
self.driver.create_volume, volume)
def test_create_volume_of_FB512(self):
"""create volume which type is FB 512."""
self.driver = FakeDS8KProxy(self.storage_info, self.logger,

11
cinder/volume/drivers/ibm/ibm_storage/ds8k_proxy.py
View File

@ -546,9 +546,16 @@ class DS8KProxy(proxy.IBMStorageProxy):
pool, find_new_pid, excluded_lss)}
return self._helper.create_lun(lun)
except restclient.LssFullException:
LOG.warning("LSS %s is full, find another one.",
lun.pool_lss_pair['source'][1])
excluded_lss.add(lun.pool_lss_pair['source'][1])
if lun.group and (lun.group.consisgroup_snapshot_enabled or
lun.group.consisgroup_replication_enabled):
msg = _("The reserve LSS for CG is full. "
"Volume can not be created on it.")
LOG.error(msg)
raise exception.VolumeDriverException(message=msg)
else:
LOG.warning("LSS %s is full, find another one.",
lun.pool_lss_pair['source'][1])
def _find_pool_lss_pair_from_spec(self, lun, excluded_lss):
if lun.group and (lun.group.consisgroup_snapshot_enabled or