New patch submitted by Federico Simoncelli (fsimonce(a)redhat.com)
You can review this change at:
http://gerrit.usersys.redhat.com/861
commit 067f769de4df00cf4015e82acd16c1319938a14f
Author: Federico Simoncelli <fsimonce(a)redhat.com>
Date: Mon Aug 29 11:01:16 2011 +0000
BZ#732914 VDSM must exit if libvirt is not running
Change-Id: I673184b8e5d765a9397f3fc14a70f7c31b907b3e
diff --git a/vdsm/libvirtconnection.py b/vdsm/libvirtconnection.py
index 1585b87..4eee356 100644
--- a/vdsm/libvirtconnection.py
+++ b/vdsm/libvirtconnection.py
@@ -103,7 +103,12 @@ def get(cif=None):
conn = __connections.get(id(cif))
if not conn:
- conn = libvirt.openAuth('qemu:///system', auth, 0)
+ try:
+ conn = libvirt.openAuth('qemu:///system', auth, 0)
+ except libvirt.libvirtError:
+ cif.log.error('Unable to connect to libvirt, taking vdsm down.',
+ exc_info=True)
+ cif.prepareForShutdown()
__connections[id(cif)] = conn
if cif != None:
for ev in (libvirt.VIR_DOMAIN_EVENT_ID_LIFECYCLE,