diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-04-08 15:22:15 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-04-08 15:22:15 -0400 |
| commit | 5ea0991db9526969f100f3361661731aaf4d24d5 (patch) | |
| tree | 395e8b80b01c8e765ba86b1a69edcac7ead0ea62 | |
| parent | 2a14bc00c0abd1e2d0349ace99db7aa922b5f574 (diff) | |
Fixes bug which hangs nova-compute when terminating an instance when using libvirt backend.
| -rw-r--r-- | nova/virt/libvirt_conn.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index b949e6c92..51a0a3380 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -325,12 +325,13 @@ class LibvirtConnection(driver.ComputeDriver): state = self.get_info(instance['name'])['state'] db.instance_set_state(context.get_admin_context(), instance['id'], state) - if state == power_state.SHUTDOWN: + if state == power_state.SHUTOFF: break - except Exception: + except Exception as ex: + LOG.debug(ex) db.instance_set_state(context.get_admin_context(), instance['id'], - power_state.SHUTDOWN) + power_state.SHUTOFF) break self.firewall_driver.unfilter_instance(instance) |