From 52d58ad583350f2448b3971eeb3f1df541cfbfe5 Mon Sep 17 00:00:00 2001
From: masumotok <masumotok@nttdata.co.jp>
Date: Wed, 18 Jan 2012 19:29:31 +0900
Subject: Fix bug #917615

Change-Id: I773b3f026fd7ebcb2aefcd2ef348cca0c5477238
---
 nova/virt/libvirt/connection.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/virt')

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)
-- 
cgit