]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Code Review / openstack-build / cinder-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: e592135)
leave re-scheduled volume status to creating
authorLiang Chen <cbjchen@cn.ibm.com>
Thu, 4 Apr 2013 15:39:54 +0000 (23:39 +0800)
committerChuck Short <chuck.short@canonical.com>
Wed, 10 Apr 2013 13:58:21 +0000 (08:58 -0500)
A re-scheduled volume should not be exported and set to available

Fixes bug #1159027

Change-Id: Ie61d9132ce1bd6461d5e4d9836424ebf14100389
(cherry picked from commit b823de4370fb306de0416d8ec1c1a70ac224207c)

cinder/volume/manager.py patch | blob | history

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index fa7e23bd7677691e48554b158c623bcd443ca0c7..b7a0e843129930b05a73ff4caf3422c1dafa2d4a 100644 (file)
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -260,6 +260,7 @@ class VolumeManager(manager.SchedulerDependentManager):
                                             snapshot_id, image_id,
                                             request_spec, filter_properties,
                                             allow_reschedule)
+                return
 
             if model_update:
                 volume_ref = self.db.volume_update(