openstack
/
cinder
Code Issues Proposed changes

Merge "Recover volume status after remove_export"

This commit is contained in:
Jenkins 2016-09-05 16:31:59 +00:00 committed by Gerrit Code Review
parent 1e1165a01f c3b33b6a23
commit 89f369ce61
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cinder/volume/manager.py
View File

@ -1103,11 +1103,6 @@ class VolumeManager(manager.SchedulerDependentManager):
context, attachment.get('id'),
{'attach_status': 'error_detaching'})
self.db.volume_detached(context.elevated(), volume_id,
attachment.get('id'))
self.db.volume_admin_metadata_delete(context.elevated(), volume_id,
'attached_mode')
# NOTE(jdg): We used to do an ensure export here to
# catch upgrades while volumes were attached (E->F)
# this was necessary to convert in-use volumes from
@ -1131,6 +1126,11 @@ class VolumeManager(manager.SchedulerDependentManager):
raise exception.RemoveExportException(volume=volume_id,
reason=six.text_type(ex))
self.db.volume_detached(context.elevated(), volume_id,
attachment.get('id'))
self.db.volume_admin_metadata_delete(context.elevated(), volume_id,
'attached_mode')
self._notify_about_volume_usage(context, volume, "detach.end")
LOG.info(_LI("Detach volume completed successfully."), resource=volume)