openstack/cinder
Code Issues Proposed changes

Dell SC: Do not set High Availability in async mode.

Browse Source 
The Dell SC driver was setting replication SyncMode to HighAvailability
even if the replication type was Asynchronous. This is not supported
on the platform.

Change-Id: I209b70e7bca790e3fbb091fa5c11ec7aad4a2480
Closes-Bug: #1597820
This commit is contained in:
Tom Swanson
2016-06-30 11:27:22 -05:00
parent 446234a530
commit b15938b746
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/tests/unit/test_dellscapi.py
View File

@@ -6100,7 +6100,6 @@ class DellSCSanAPITestCase(test.TestCase):
'StorageCenter': ssn,
'ReplicateActiveReplay': False,
'Type': 'Asynchronous',
'SyncMode': 'HighAvailability',
'DestinationVolumeAttributes':
{'CreateSourceVolumeFolderPath': True,
'Notes': notes,
@@ -6116,6 +6115,7 @@ class DellSCSanAPITestCase(test.TestCase):
self.assertDictEqual(self.SCREPL[0], ret)
payload['Type'] = 'Synchronous'
payload['ReplicateActiveReplay'] = True
payload['SyncMode'] = 'HighAvailability'
ret = self.scapi.create_replication(self.VOLUME,
str(destssn),
qosnode,
@@ -6166,7 +6166,6 @@ class DellSCSanAPITestCase(test.TestCase):
'StorageCenter': ssn,
'ReplicateActiveReplay': False,
'Type': 'Asynchronous',
'SyncMode': 'HighAvailability',
'DestinationVolumeAttributes':
{'CreateSourceVolumeFolderPath': True,
'Notes': notes,
@@ -6183,6 +6182,7 @@ class DellSCSanAPITestCase(test.TestCase):
payload['Type'] = 'Synchronous'
payload['ReplicateActiveReplay'] = True
payload['SyncMode'] = 'HighAvailability'
ret = self.scapi.create_replication(self.VOLUME,
str(destssn),
qosnode,

8
cinder/volume/drivers/dell/dell_storagecenter_api.py
View File

@@ -2702,8 +2702,12 @@ class StorageCenterApi(object):
payload['StorageCenter'] = self.find_sc()
# Have to replicate the active replay.
payload['ReplicateActiveReplay'] = replicate_active or synchronous
payload['Type'] = 'Synchronous' if synchronous else 'Asynchronous'
payload['SyncMode'] = 'HighAvailability'
if synchronous:
payload['Type'] = 'Synchronous'
# If our type is synchronous we prefer high availability be set.
payload['SyncMode'] = 'HighAvailability'
else:
payload['Type'] = 'Asynchronous'
destinationvolumeattributes = {}
destinationvolumeattributes['CreateSourceVolumeFolderPath'] = True
destinationvolumeattributes['Notes'] = self.notes