[openstack-nova/el6] log live migration errors

[Pádraig Brady]

commit f06904e922d1125ca7c3a481dbfa18b01eb621a4
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Aug 8 14:20:38 2012 +0100

    log live migration errors

 0045-Add-error-log-for-live-migration.patch |   31 +++++++++++++++++++++++++++
 openstack-nova.spec                         |    7 +++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/0045-Add-error-log-for-live-migration.patch b/0045-Add-error-log-for-live-migration.patch
new file mode 100644
index 0000000..7bc3553
--- /dev/null
+++ b/0045-Add-error-log-for-live-migration.patch
@@ -0,0 +1,31 @@
+From 2b0c67544787182a6ff908ab65b7a2ae34a4d38f Mon Sep 17 00:00:00 2001
+From: Takaaki Suzuki <suzuki at midokura.com>
+Date: Wed, 8 Aug 2012 11:21:55 +0900
+Subject: [PATCH] Add error log for live migration.
+
+Fixes bug: 917615
+Change-Id: I740c0def3b1f759aec3d4ae5fe3264484c704807
+Signed-off-by: Takaaki Suzuki <suzuki at midokura.com>
+
+Conflicts:
+
+	nova/virt/libvirt/connection.py
+---
+ nova/virt/libvirt/connection.py |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
+index 11e5b34..05458b4 100644
+--- a/nova/virt/libvirt/connection.py
++++ b/nova/virt/libvirt/connection.py
+@@ -2082,7 +2082,9 @@ class LibvirtConnection(driver.ComputeDriver):
+                              None,
+                              FLAGS.live_migration_bandwidth)
+ 
+-        except Exception:
++        except Exception as e:
++            LOG.error(_("Live Migration failure: %(e)s") % locals(),
++                      instance=instance_ref)
+             with utils.save_and_reraise_exception():
+                 recover_method(ctxt, instance_ref, dest, block_migration)
+ 
diff --git a/openstack-nova.spec b/openstack-nova.spec
index be1edf7..c62fb0e 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,7 +2,7 @@
 
 Name:             openstack-nova
 Version:          2012.1.1
-Release:          12%{?dist}
+Release:          13%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -84,6 +84,7 @@ Patch0041: 0041-use-boto-s-HTTPResponse-class-for-versions-of-boto-2.patch
 Patch0042: 0042-Convert-remaining-network-API-casts-to-calls.patch
 Patch0043: 0043-Moving-where-the-fixed-ip-deallocation-happens.patch
 Patch0044: 0044-fix-the-qpid_heartbeat-option-so-that-it-s-effective.patch
+Patch0045: 0045-Add-error-log-for-live-migration.patch
 
 # This is EPEL specific and not upstream
 Patch100:         openstack-nova-newdeps.patch
@@ -439,6 +440,7 @@ This package contains documentation files for nova.
 %patch0042 -p1
 %patch0043 -p1
 %patch0044 -p1
+%patch0045 -p1
 
 # Apply EPEL patch
 %patch100 -p1
@@ -826,6 +828,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug  8 2012 Pádraig Brady <P at draigBrady.com> - 2012.1.1-13
+- Log live migration errors
+
 * Mon Aug  6 2012 Pádraig Brady <P at draigBrady.com> - 2012.1.1-12
 - Fix group installation issue introduced in 2012.1.1-10