openstack/nova
Code Issues Proposed changes

This branch fixes https://bugs.launchpad.net/nova/+bug/751242.

Browse Source 
According to the above URL, the solution is 'migrating' instances never be terminated. 
To do this, nova.compute.api.delete() should be modified.
This commit is contained in:
Kei Masumoto 2011-04-08 16:08:56 +00:00 committed by Tarmac
commit 9b449fc8a6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/compute/api.py
View File

@ -370,11 +370,15 @@ class API(base.Base):
instance_id)
raise
if (instance['state_description'] == 'terminating'):
if instance['state_description'] == 'terminating':
LOG.warning(_("Instance %s is already being terminated"),
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',