Commit e1233fb2 authored by Anael Beutot's avatar Anael Beutot
Browse files

Fixed libvirt bad exception when destroying a VM. 

Libvirt raises an exception saying "domain not runnning" when trying to destroy
a VM that is in fact running. So we try to figure out if this is this kind of
exception and we ignore it in this case.
parent f9408b11

ccnode/hypervisor/__init__.py

+7 −3
Original line number Diff line number Diff line
@@ -200,7 +200,11 @@ class Handler(HostHandler): 
        logger.debug('VM destroy %s', name)

        try:

            self.hypervisor.domains[name].destroy()

        except libvirt.libvirtError:

        except libvirt.libvirtError as exc:

            # Libvirt raises exception 'domain is not running' event is domain

            # is running, might be a bug in libvirt

            if 'domain is not running' not in str(exc) or (

                self.hypervisor.domains[name].state != 'running'):

                logger.exception('Error while destroying VM %s', name)

                raise

        except KeyError: