openstack/deb-cinder
Code Issues Proposed changes

Merge "Check volume status in detach db api"

Browse Source
This commit is contained in:
Jenkins
2015-04-06 13:40:26 +00:00
committed by Gerrit Code Review
parent c5cb524967 909a4eb2fd
commit f8b6feb5eb
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/db/sqlalchemy/api.py
View File

@@ -1215,7 +1215,9 @@ def volume_detached(context, volume_id, attachment_id):
volume_ref = _volume_get(context, volume_id, session=session)
if not remain_attachment:
# Hide status update from user if we're performing volume migration
if not volume_ref['migration_status']:
# or uploading it to image
if (not volume_ref['migration_status'] and
not (volume_ref['status'] == 'uploading')):
volume_ref['status'] = 'available'
volume_ref['attach_status'] = 'detached'