openstack/cinder
Code Issues Proposed changes

Fixed issue with mismatched config in VMAX driver

Browse Source 
When the source and target volumes have different meta device
configurations, clone volume will fail. This patch fixed the
problem.

Closes-Bug: #1442376
Change-Id: If2f2c085596b0045d7af6762bddeb4cd59158a57
This commit is contained in:
Xing Yang
2015-04-15 15:33:59 -04:00
parent c8b413696a
commit 58556d2a16
4 changed files with 72 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
cinder/volume/drivers/emc/emc_vmax_common.py
View File

@@ -2671,41 +2671,47 @@ class EMCVMAXCommon(object):
return memberInstanceNames
def _create_composite_volume(
self, volume, volumeName, volumeSize, extraSpecs):
self, volume, volumeName, volumeSize, extraSpecs,
memberCount=None):
"""Create a composite volume (V2).
:param volume: the volume object
:param volumeName: the name of the volume
:param volumeSize: the size of the volume
:param extraSpecs: extra specifications
:param memberCount: the number of meta members in a composite volume
:returns: int -- return code
:returns: dict -- volumeDict
:returns: string -- storageSystemName
:raises: VolumeBackendAPIException
"""
memberCount, errorDesc = self.utils.determine_member_count(
volume['size'], extraSpecs[MEMBERCOUNT],
extraSpecs[COMPOSITETYPE])
if errorDesc is not None:
exceptionMessage = (_("The striped meta count of %(memberCount)s "
"is too small for volume: %(volumeName)s "
"with size %(volumeSize)s.")
% {'memberCount': memberCount,
'volumeName': volumeName,
'volumeSize': volume['size']})
LOG.error(exceptionMessage)
raise exception.VolumeBackendAPIException(data=exceptionMessage)
if not memberCount:
memberCount, errorDesc = self.utils.determine_member_count(
volume['size'], extraSpecs[MEMBERCOUNT],
extraSpecs[COMPOSITETYPE])
if errorDesc is not None:
exceptionMessage = (_("The striped meta count of "
"%(memberCount)s is too small for "
"volume: %(volumeName)s, "
"with size %(volumeSize)s.")
% {'memberCount': memberCount,
'volumeName': volumeName,
'volumeSize': volume['size']})
LOG.error(exceptionMessage)
raise exception.VolumeBackendAPIException(
data=exceptionMessage)
poolInstanceName, storageSystemName = (
self._get_pool_and_storage_system(extraSpecs))
LOG.debug("Create Volume: %(volume)s Pool: %(pool)s "
"Storage System: %(storageSystem)s "
"Size: %(size)lu.",
"Size: %(size)lu MemberCount: %(memberCount)s.",
{'volume': volumeName,
'pool': poolInstanceName,
'storageSystem': storageSystemName,
'size': volumeSize})
'size': volumeSize,
'memberCount': memberCount})
elementCompositionService = (
self.utils.find_element_composition_service(self.conn,
@@ -3483,7 +3489,7 @@ class EMCVMAXCommon(object):
_rc, baseVolumeDict, storageSystemName = (
self._create_composite_volume(
volume, baseVolumeName, volumeSizeInbits,
extraSpecs))
extraSpecs, 1))
baseTargetVolumeInstance = self.utils.find_volume_instance(
self.conn, baseVolumeDict, baseVolumeName)
LOG.debug("Base target volume %(targetVol)s created. "

3
cinder/volume/drivers/emc/emc_vmax_fc.py
View File

@@ -34,9 +34,10 @@ class EMCVMAXFCDriver(driver.FibreChannelDriver):
performance enhancement.
2.0.0 - Add driver requirement functions
2.1.0 - Add consistency group functions
2.1.1 - Fixed issue with mismatched config (bug #1442376)
"""
VERSION = "2.1.0"
VERSION = "2.1.1"
def __init__(self, *args, **kwargs):

3
cinder/volume/drivers/emc/emc_vmax_iscsi.py
View File

@@ -42,9 +42,10 @@ class EMCVMAXISCSIDriver(driver.ISCSIDriver):
performance enhancement.
2.0.0 - Add driver requirement functions
2.1.0 - Add consistency group functions
2.1.1 - Fixed issue with mismatched config (bug #1442376)
"""
VERSION = "2.1.0"
VERSION = "2.1.1"
def __init__(self, *args, **kwargs):