Vinzenz Feenstra has uploaded a new change for review. Change subject: vdsm: Do not fail releasing a VM due to agent stopping errors ......................................................................
vdsm: Do not fail releasing a VM due to agent stopping errors If the guest agent socket couldn't get created for whatever reason VDSM will no longer be able to stop release the VM without killing it manually and restarting the VDSM service. This patch is fixing this problem and also logs the occurrences. Change-Id: I10ac23b11294dc90e4980944d7ba6fad6abc22dc Bug-Url: https://bugzilla.redhat.com/985770 Signed-off-by: Vinzenz Feenstra <[email protected]> --- M vdsm/guestIF.py M vdsm/vm.py 2 files changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/72/17072/1 diff --git a/vdsm/guestIF.py b/vdsm/guestIF.py index dae4c3b..4c8de0f 100644 --- a/vdsm/guestIF.py +++ b/vdsm/guestIF.py @@ -242,6 +242,10 @@ pass else: raise + except AttributeError: + # This is not supposed to happen, but might if we fail to connect + # to the VirtIO channel because it does not exist. + self.log.exception("Failure on unregistering guest VirtIO channel") else: self._sock.close() diff --git a/vdsm/vm.py b/vdsm/vm.py index a630e39..44bf108 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -4207,7 +4207,15 @@ if self._vmStats: self._vmStats.stop() if self.guestAgent: - self.guestAgent.stop() + try: + self.guestAgent.stop() + except Exception: + # This is on purpose that generic because there's + # reason for letting the destroy now fail. + # We'll just logging it + self.log.exception("Failure occurred during stopping " + "of the guest agent communication " + "instance") if self._dom: try: self._dom.destroyFlags( -- To view, visit http://gerrit.ovirt.org/17072 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I10ac23b11294dc90e4980944d7ba6fad6abc22dc Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
