openstack/cinder
Code Issues Proposed changes

PowerMax Driver - Promotion RDF Group number fix

Browse Source 
Use remote array SID when finding rdf group number
when performing retype during failover. The remote
array may potentially be unavailable at this point.

Closes-Bug: #1908922
Change-Id: Ie5645e4664b794cfea6babcaa5b483c059b21985
This commit is contained in:
odonos12 2020-09-14 15:30:37 +01:00 committed by Helen Walsh
parent e410315074
commit f0652209f4
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cinder/tests/unit/volume/drivers/dell_emc/powermax/test_powermax_replication.py
View File

@ -493,6 +493,20 @@ class PowerMaxReplicationTest(test.TestCase):
extra_specs1, rep_config)
self.assertEqual(ref_specs2, rep_extra_specs2)
@mock.patch.object(common.PowerMaxCommon, 'get_rdf_details',
return_value=(1, True))
@mock.patch.object(rest.PowerMaxRest,
'get_array_model_info',
return_value=('VMAX250F', False))
def test_get_replication_extra_specs_get_rdf_group_promotion(
self, mock_model, mck_rdf):
self.common.promotion = True
remote_array = self.data.remote_array
rep_config = self.data.rep_config_sync
extra_specs1 = deepcopy(self.extra_specs)
self.common._get_replication_extra_specs(extra_specs1, rep_config)
mck_rdf.assert_called_with(remote_array, rep_config)
@mock.patch.object(rest.PowerMaxRest,
'get_array_model_info',
return_value=('PowerMax 2000', True))

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

@ -5345,9 +5345,11 @@ class PowerMaxCommon(object):
rep_extra_specs[utils.PORTGROUPNAME] = rep_config['portgroup']
# Get the RDF Group label & number
array = (rep_config[utils.ARRAY] if self.promotion else
extra_specs[utils.ARRAY])
rep_extra_specs['rdf_group_label'] = rep_config['rdf_group_label']
rdf_group_no, __ = self.get_rdf_details(
extra_specs['array'], rep_config)
array, rep_config)
rep_extra_specs['rdf_group_no'] = rdf_group_no
# Get the SRDF wait/retries settings
rep_extra_specs['sync_retries'] = rep_config['sync_retries']

6
releasenotes/notes/promotion_rdfg_num_fix-65a5838277ac8edf.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
PowerMax Driver - Promotion RDF Group number fix uses remote array
SID when finding rdf group number when performing retype during
failover.