openstack
/
cinder
Code Issues Proposed changes

Synology: fix snapshot metadata loss 

Snapshot metadata cannot be retrieved after creating snapshots. The root
cause is Synology driver overwrites old snapshot metadata instead of
appending new metadata to the old one.

Change-Id: Ic917bde0853cbd271add8c43b0d017bf7bc627f6
Closes-Bug: #1680701
This commit is contained in:
taylorh 2017-04-06 17:53:39 +08:00
parent 506e31f253
commit 6241c77716
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cinder/tests/unit/volume/drivers/synology/test_synology_common.py
View File

@ -64,9 +64,9 @@ NEW_VOLUME = {
SNAPSHOT_ID = fake.SNAPSHOT_ID
DS_SNAPSHOT_UUID = 'ca86a56a-40d8-4210-974c-ef15dbf01cba'
SNAPSHOT_METADATA = {
'metadata': {
'ds_snapshot_UUID': DS_SNAPSHOT_UUID
}
'snap-meta1': 'value1',
'snap-meta2': 'value2',
'snap-meta3': 'value3',
}
SNAPSHOT = {
'name': fake.SNAPSHOT_NAME,
@ -1403,11 +1403,13 @@ class SynoCommonTestCase(test.TestCase):
NEW_VOLUME)
def test_create_snapshot(self):
metadata = {
expected_result = {
'metadata': {
self.common.METADATA_DS_SNAPSHOT_UUID: DS_SNAPSHOT_UUID
}
}
expected_result['metadata'].update(SNAPSHOT['metadata'])
out = {
'data': {
'snapshot_uuid': DS_SNAPSHOT_UUID,
@ -1431,7 +1433,7 @@ class SynoCommonTestCase(test.TestCase):
taken_by='Cinder',
description='(Cinder) ' +
SNAPSHOT['id']))
self.assertDictEqual(metadata, result)
self.assertDictEqual(expected_result, result)
self.assertRaises(exception.VolumeDriverException,
self.common.create_snapshot,

10
cinder/volume/drivers/synology/synology_common.py
View File

@ -1153,10 +1153,12 @@ class SynoCommon(object):
'snapshot': snapshot_uuid})
raise exception.VolumeDriverException(message=message)
return {
'metadata': {
self.METADATA_DS_SNAPSHOT_UUID: snapshot_uuid
}}
metadata = snapshot['metadata']
metadata.update({
self.METADATA_DS_SNAPSHOT_UUID: snapshot_uuid
})
return {'metadata': metadata}
def delete_snapshot(self, snapshot):
try: