diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-20 18:04:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-20 18:04:55 +0000 |
| commit | f61a58348a40686ee0a7dc926d6b6dc679239b60 (patch) | |
| tree | 3973f0ee4c1758fe5ca963b1394a20226d3dbce0 | |
| parent | 018a9f1b71421cbdeeeac316e0df458588fa147b (diff) | |
| parent | fdd9325df75652a95a96ccd4e59b73556df811c6 (diff) | |
| download | nova-f61a58348a40686ee0a7dc926d6b6dc679239b60.tar.gz nova-f61a58348a40686ee0a7dc926d6b6dc679239b60.tar.xz nova-f61a58348a40686ee0a7dc926d6b6dc679239b60.zip | |
Merge "Fix startup with DELETED instances"
| -rw-r--r-- | nova/compute/manager.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 42a2fd447..76c91a575 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -278,6 +278,13 @@ class ComputeManager(manager.SchedulerDependentManager): for count, instance in enumerate(instances): db_state = instance['power_state'] drv_state = self._get_power_state(context, instance) + closing_vm_states = (vm_states.DELETED, + vm_states.SOFT_DELETED) + + # instance was supposed to shut down - don't attempt + # recovery in any case + if instance['vm_state'] in closing_vm_states: + continue expect_running = (db_state == power_state.RUNNING and drv_state != db_state) |