openstack/cinder
Code Issues Proposed changes

Merge "PowerMax Driver - Prevent unmanage with snapvx"

Browse Source
This commit is contained in:
Zuul 2020-09-17 13:56:51 +00:00 committed by Gerrit Code Review
commit 4afba15fbf
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cinder/tests/unit/volume/drivers/dell_emc/powermax/test_powermax_common.py
View File

@ -2012,10 +2012,12 @@ class PowerMaxCommonTest(test.TestCase):
self.common.manage_existing_get_size, self.common.manage_existing_get_size,
self.data.test_volume, external_ref) self.data.test_volume, external_ref)
@mock.patch.object(rest.PowerMaxRest, 'is_vol_in_rep_session',
return_value=(False, False, False))
@mock.patch.object(common.PowerMaxCommon, @mock.patch.object(common.PowerMaxCommon,
'_remove_vol_and_cleanup_replication') '_remove_vol_and_cleanup_replication')
@mock.patch.object(common.PowerMaxCommon, '_clone_check') @mock.patch.object(common.PowerMaxCommon, '_clone_check')
def test_unmanage_success(self, mck_clone, mock_rm): def test_unmanage_success(self, mck_clone, mock_rm, mck_sess):
volume = self.data.test_volume volume = self.data.test_volume
with mock.patch.object(self.rest, 'rename_volume') as mock_rename: with mock.patch.object(self.rest, 'rename_volume') as mock_rename:
self.common.unmanage(volume) self.common.unmanage(volume)
@ -2040,6 +2042,14 @@ class PowerMaxCommonTest(test.TestCase):
self.common.unmanage(volume) self.common.unmanage(volume)
mock_rename.assert_not_called() mock_rename.assert_not_called()
@mock.patch.object(rest.PowerMaxRest, 'is_vol_in_rep_session',
return_value=(True, True, False))
@mock.patch.object(common.PowerMaxCommon, '_clone_check')
def test_unmanage_temp_snapshot_links(self, mck_clone, mck_sess):
volume = self.data.test_volume
self.assertRaises(exception.VolumeIsBusy, self.common.unmanage,
volume)
@mock.patch.object(common.PowerMaxCommon, '_slo_workload_migration') @mock.patch.object(common.PowerMaxCommon, '_slo_workload_migration')
def test_retype(self, mock_migrate): def test_retype(self, mock_migrate):
device_id = self.data.device_id device_id = self.data.device_id

16
cinder/volume/drivers/dell_emc/powermax/common.py
View File

@ -3378,13 +3378,27 @@ class PowerMaxCommon(object):
{'name': volume_name, 'id': volume_id}) {'name': volume_name, 'id': volume_id})
extra_specs = self._initial_setup(volume) extra_specs = self._initial_setup(volume)
device_id = self._find_device_on_array(volume, extra_specs) device_id = self._find_device_on_array(volume, extra_specs)
array = extra_specs['array']
if device_id is None: if device_id is None:
LOG.error("Cannot find Volume: %(id)s for " LOG.error("Cannot find Volume: %(id)s for "
"unmanage operation. Exiting...", "unmanage operation. Exiting...",
{'id': volume_id}) {'id': volume_id})
else: else:
# Check if volume is snap source # Check if volume is snap source
self._clone_check(extra_specs['array'], device_id, extra_specs) self._clone_check(array, device_id, extra_specs)
snapvx_tgt, snapvx_src, __ = self.rest.is_vol_in_rep_session(
array, device_id)
if snapvx_src or snapvx_tgt:
msg = _(
'Cannot unmanage volume %s with device id %s as it is '
'busy. Please either wait until all temporary snapshot '
'have expired or manually unlink and terminate any '
'remaining temporary sessions when they have been '
'fully copied to their targets. Volume is a snapvx '
'source: %s. Volume is a snapvx target: %s' %
(volume_id, device_id, snapvx_src, snapvx_tgt))
LOG.error(msg)
raise exception.VolumeIsBusy(volume.id)
# Remove volume from any openstack storage groups # Remove volume from any openstack storage groups
# and remove any replication # and remove any replication
self._remove_vol_and_cleanup_replication( self._remove_vol_and_cleanup_replication(