From a88b441e53499fdfb073ac8b28d33e5a5c0efae7 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Fri, 31 Aug 2012 18:40:18 +0100 Subject: [PATCH] Fixing call to hasManagedSaveImage Fixes bug #1044090 hasManagedSaveImage is not implmented in the LXC libvirt driver, resulting in the following error when a vm is deleted "Error from libvirt during saved instance removal. Code=3 Error=this function is not supported by the connection driver: virDomainHasManagedSaveImage" This commit replaces the use of hasManagedSaveImage, managedSaveRemove and undefine with undefineFlags (for kvm and qemu) which does the work of all 3 calls and is implemented in versions of libvirt > 0.9.4. We also revert back to calling undefine if undefineFlags raises an error or if the libvirt type is not one of kvm and qemu. Change-Id: Ib8d451aeff7767f835c3c1aab99ee4ab5e299852 --- nova/tests/test_libvirt.py | 29 +++++++++++++++++++++++++---- nova/virt/libvirt/driver.py | 23 +++++++++++------------ 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index 936a044..2bc1a64 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -2160,12 +2160,33 @@ class LibvirtConnTestCase(test.TestCase): instance = db.instance_create(self.context, self.test_instance) conn.destroy(instance, {}) - def test_destroy_saved(self): - """Ensure destroy calls managedSaveRemove for saved instance""" + def test_destroy(self): + """Ensure destroy calls virDomain.undefineFlags""" + mock = self.mox.CreateMock(libvirt.virDomain) + mock.destroy() + mock.undefineFlags(1).AndReturn(1) + + self.mox.ReplayAll() + + def fake_lookup_by_name(instance_name): + return mock + + def fake_get_info(instance_name): + return {'state': power_state.SHUTDOWN} + + conn = libvirt_driver.LibvirtDriver(False) + self.stubs.Set(conn, '_lookup_by_name', fake_lookup_by_name) + self.stubs.Set(conn, 'get_info', fake_get_info) + instance = {"name": "instancename", "id": "instanceid", + "uuid": "875a8070-d0b9-4949-8b31-104d125c9a64"} + conn.destroy(instance, []) + + def test_destroy_noflag(self): + """Ensure destroy calls virDomain.undefine + if mock.undefineFlags raises an error""" mock = self.mox.CreateMock(libvirt.virDomain) mock.destroy() - mock.hasManagedSaveImage(0).AndReturn(1) - mock.managedSaveRemove(0) + mock.undefineFlags(1).AndRaise(libvirt.libvirtError('Err')) mock.undefine() self.mox.ReplayAll() diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 6207c6c..1c563ee 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -483,18 +483,17 @@ class LibvirtDriver(driver.ComputeDriver): virt_dom = None if virt_dom: try: - # NOTE(derekh): we can switch to undefineFlags and - # VIR_DOMAIN_UNDEFINE_MANAGED_SAVE once we require 0.9.4 - if virt_dom.hasManagedSaveImage(0): - virt_dom.managedSaveRemove(0) - except libvirt.libvirtError as e: - errcode = e.get_error_code() - LOG.error(_("Error from libvirt during saved instance " - "removal. Code=%(errcode)s Error=%(e)s") % - locals(), instance=instance) - try: - # NOTE(justinsb): We remove the domain definition. - virt_dom.undefine() + # Remove domain definition and saved instances (if supported) + if FLAGS.libvirt_type in ['kvm', 'qemu']: + try: + virt_dom.undefineFlags( + libvirt.VIR_DOMAIN_UNDEFINE_MANAGED_SAVE) + except libvirt.libvirtError as e: + LOG.error(_("Error from libvirt during undefineFlags." + " Retrying with undefine"), instance=instance) + virt_dom.undefine() + else: + virt_dom.undefine() except libvirt.libvirtError as e: errcode = e.get_error_code() LOG.error(_("Error from libvirt during undefine. " -- 1.7.11.4