openstack/cinder
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins
2016-06-30 23:08:32 +00:00
committed by Gerrit Code Review
parent 0a2baaf6e5 b15938b746
commit 4415c6fcb5
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, 'StorageCenter': ssn,
'ReplicateActiveReplay': False, 'ReplicateActiveReplay': False,
'Type': 'Asynchronous', 'Type': 'Asynchronous',
'SyncMode': 'HighAvailability',
'DestinationVolumeAttributes': 'DestinationVolumeAttributes':
{'CreateSourceVolumeFolderPath': True, {'CreateSourceVolumeFolderPath': True,
'Notes': notes, 'Notes': notes,
@@ -6116,6 +6115,7 @@ class DellSCSanAPITestCase(test.TestCase):
self.assertDictEqual(self.SCREPL[0], ret) self.assertDictEqual(self.SCREPL[0], ret)
payload['Type'] = 'Synchronous' payload['Type'] = 'Synchronous'
payload['ReplicateActiveReplay'] = True payload['ReplicateActiveReplay'] = True
payload['SyncMode'] = 'HighAvailability'
ret = self.scapi.create_replication(self.VOLUME, ret = self.scapi.create_replication(self.VOLUME,
str(destssn), str(destssn),
qosnode, qosnode,
@@ -6166,7 +6166,6 @@ class DellSCSanAPITestCase(test.TestCase):
'StorageCenter': ssn, 'StorageCenter': ssn,
'ReplicateActiveReplay': False, 'ReplicateActiveReplay': False,
'Type': 'Asynchronous', 'Type': 'Asynchronous',
'SyncMode': 'HighAvailability',
'DestinationVolumeAttributes': 'DestinationVolumeAttributes':
{'CreateSourceVolumeFolderPath': True, {'CreateSourceVolumeFolderPath': True,
'Notes': notes, 'Notes': notes,
@@ -6183,6 +6182,7 @@ class DellSCSanAPITestCase(test.TestCase):
payload['Type'] = 'Synchronous' payload['Type'] = 'Synchronous'
payload['ReplicateActiveReplay'] = True payload['ReplicateActiveReplay'] = True
payload['SyncMode'] = 'HighAvailability'
ret = self.scapi.create_replication(self.VOLUME, ret = self.scapi.create_replication(self.VOLUME,
str(destssn), str(destssn),
qosnode, qosnode,

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

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