Sophie: openstack-nova-2011.3.1-11.fc16 src

openstack-nova-2011.3.1-11.fc16.src.rpm

From 4f43496502aef88752e616695e29f930f09009c3 Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall@managedit.ie>
Date: Fri, 20 Jan 2012 20:26:24 +0000
Subject: [PATCH] Fix bug #917615.

Partial Cherry-Pick of 52d58ad583350f2448b3971eeb3f1df541cfbfe5.

Changes to nova.compute.manager.recover_live_migration() discarded as they are unnecessary for diablo.

Conflicts:

	nova/compute/manager.py

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

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 55cb31d..80e9655 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -1711,8 +1711,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)