From: Tomoki Sekiyama Date: Sat, 19 Jul 2014 00:36:56 +0000 (-0400) Subject: Fix failure of source volume deletion in migrate_volume_completion X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1945b82ff5ac30fad1c94849e86c4c3b5d4a28e1;p=openstack-build%2Fcinder-build.git Fix failure of source volume deletion in migrate_volume_completion In VolumeManager.migrate_volume_completion(), when volume_status is not 'retyping', status_update is not set. However, status_update is always referenced as dictionary on volume deletion path, so it fails to delete migration source volume. This patch fixes the issue. Change-Id: I06889dae326b9557e044f1712d9f3205bb68a953 Closes-Bug: 1344341 --- diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py index aad9fe9ad..3719c7262 100644 --- a/cinder/volume/manager.py +++ b/cinder/volume/manager.py @@ -997,7 +997,7 @@ class VolumeManager(manager.SchedulerDependentManager): # Delete the source volume (if it fails, don't fail the migration) try: - if status_update['status'] == 'in-use': + if status_update and status_update['status'] == 'in-use': self.detach_volume(ctxt, volume_id) self.delete_volume(ctxt, volume_id) except Exception as ex: