summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKei Masumoto <masumotok@nttdata.co.jp>2011-04-05 20:39:22 +0900
committerKei Masumoto <masumotok@nttdata.co.jp>2011-04-05 20:39:22 +0900
commitca2ce6dc4a96c7bded2c30c258b7becaee5a1ed7 (patch)
tree6e64e7caf69f2a7efad223c0edecbfc3c9b226dc
parent08417c48c223ad1b698ab1d00686a967b6a2dc0a (diff)
downloadnova-ca2ce6dc4a96c7bded2c30c258b7becaee5a1ed7.tar.gz
nova-ca2ce6dc4a96c7bded2c30c258b7becaee5a1ed7.tar.xz
nova-ca2ce6dc4a96c7bded2c30c258b7becaee5a1ed7.zip
fix bug lp751242
-rw-r--r--nova/compute/api.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 996955fe3..f67aa47e8 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -372,6 +372,10 @@ class API(base.Base):
instance_id)
return
+ if (instance['state_description'] == 'migrating'):
+ LOG.warning(_("Instance %s is being migrated"), instance_id)
+ return
+
self.update(context,
instance['id'],
state_description='terminating',