openstack
/
cinder
Code Issues Proposed changes

Modify the position of try-except 

It will be raise a exception when attachments is None. So, this
patch is aim to avoid this potential exception.

Change-Id: Idabd6c1434855071f8024368ae24706e0cd3c4c3
Closed-Bug: #1642220
This commit is contained in:
xianming mao 2016-11-16 14:52:46 +08:00
parent 327e4b8555
commit b63c622d4f
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cinder/volume/manager.py
View File

@ -1840,15 +1840,17 @@ class VolumeManager(manager.CleanableManager,
# As after detach and refresh, volume_attchments will be None.
# We keep volume_attachment for later attach.
if orig_volume_status == 'in-use':
attachments = volume.volume_attachment
else:
attachments = None
try:
for attachment in attachments:
self.detach_volume(ctxt, volume.id, attachment['id'])
except Exception as ex:
LOG.error(_LE("Detach migration source volume failed: %(err)s"),
{'err': ex}, resource=volume)
for attachment in volume.volume_attachment:
try:
self.detach_volume(ctxt, volume.id, attachment.id)
except Exception as ex:
LOG.error(_LE("Detach migration source volume "
"%(volume.id)s from instance "
"%(instance_id)s failed: %(err)s"),
{'err': ex,
'volume.id': volume.id,
'instance_id': attachment.id},
resource=volume)
# Give driver (new_volume) a chance to update things as needed
# after a successful migration.
@ -1867,7 +1869,7 @@ class VolumeManager(manager.CleanableManager,
'migration_status': 'success'}
if orig_volume_status == 'in-use':
for attachment in attachments:
for attachment in volume.volume_attachment:
rpcapi.attach_volume(ctxt, volume,
attachment['instance_uuid'],
attachment['attached_host'],