diff options
| author | masumotok <masumotok@nttdata.co.jp> | 2012-01-18 19:29:31 +0900 |
|---|---|---|
| committer | masumotok <masumotok@nttdata.co.jp> | 2012-01-18 19:37:14 +0900 |
| commit | 52d58ad583350f2448b3971eeb3f1df541cfbfe5 (patch) | |
| tree | 5995a29d368a0e56faa693c9c9c7f755c9ddc49e | |
| parent | 7bb9f3413a2bc6ef56ab3c384d0624f193e58e34 (diff) | |
| download | nova-52d58ad583350f2448b3971eeb3f1df541cfbfe5.tar.gz nova-52d58ad583350f2448b3971eeb3f1df541cfbfe5.tar.xz nova-52d58ad583350f2448b3971eeb3f1df541cfbfe5.zip | |
Fix bug #917615
Change-Id: I773b3f026fd7ebcb2aefcd2ef348cca0c5477238
| -rw-r--r-- | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt/connection.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 999143153..8519aa7e3 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1985,7 +1985,7 @@ class ComputeManager(manager.SchedulerDependentManager): block_device_info = \ self._get_instance_volume_block_device_info(context, instance_id) self.driver.destroy(instance_ref, network_info, - block_device_info, True) + block_device_info) @manager.periodic_task def _poll_rebooting_instances(self, context): diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index 4e5c86ea4..3e2ed652a 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -1712,8 +1712,8 @@ class LibvirtConnection(driver.ComputeDriver): FLAGS.live_migration_bandwidth) except Exception: - recover_method(ctxt, instance_ref, dest, block_migration) - raise + with utils.save_and_reraise_exception(): + recover_method(ctxt, instance_ref, dest, block_migration) # Waiting for completion of live_migration. timer = utils.LoopingCall(f=None) |