diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-08 08:25:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-08 08:25:07 +0000 |
| commit | 2082e47e90cda9edd9af35db6ca5c8e31760233b (patch) | |
| tree | 7f7f8b3e80b4acc8c8a4a9c5813027eae9b7c6ef /nova | |
| parent | 19470f45454cbeb6f980e29eba860954fce15bbc (diff) | |
| parent | 95e7770399a74e99f3dcad777186ee4f58e4e206 (diff) | |
| download | nova-2082e47e90cda9edd9af35db6ca5c8e31760233b.tar.gz nova-2082e47e90cda9edd9af35db6ca5c8e31760233b.tar.xz nova-2082e47e90cda9edd9af35db6ca5c8e31760233b.zip | |
Merge "Avoid vm instance shutdown when power state is NOSTATE"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/compute/manager.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 6caf5c61d..699d53b83 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -3110,7 +3110,7 @@ class ComputeManager(manager.SchedulerDependentManager): vm_instance = self.driver.get_info(db_instance) vm_power_state = vm_instance['state'] except exception.InstanceNotFound: - vm_power_state = power_state.NOSTATE + vm_power_state = power_state.SHUTDOWN # Note(maoy): the above get_info call might take a long time, # for example, because of a broken libvirt driver. # We re-query the DB to get the latest instance info to minimize @@ -3161,9 +3161,8 @@ class ComputeManager(manager.SchedulerDependentManager): pass elif vm_state == vm_states.ACTIVE: # The only rational power state should be RUNNING - if vm_power_state in (power_state.NOSTATE, - power_state.SHUTDOWN, - power_state.CRASHED): + if vm_power_state in (power_state.SHUTDOWN, + power_state.CRASHED): LOG.warn(_("Instance shutdown by itself. Calling " "the stop API."), instance=db_instance) try: |