Martin Sivák has uploaded a new change for review. Change subject: Handle Sanlock issues properly when force cleaning ......................................................................
Handle Sanlock issues properly when force cleaning Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1116469 Change-Id: I7c91ff4251f568c404cefb4c8b567cba2db35fc8 Signed-off-by: Martin Sivak <msi...@redhat.com> --- M ovirt_hosted_engine_ha/agent/hosted_engine.py 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-ha refs/changes/02/42202/1 diff --git a/ovirt_hosted_engine_ha/agent/hosted_engine.py b/ovirt_hosted_engine_ha/agent/hosted_engine.py index bb4df09..8d9d009 100644 --- a/ovirt_hosted_engine_ha/agent/hosted_engine.py +++ b/ovirt_hosted_engine_ha/agent/hosted_engine.py @@ -311,7 +311,13 @@ self._initialize_vdsm() self._initialize_domain_monitor() self._initialize_broker(monitors=[]) - self._initialize_sanlock() + try: + self._initialize_sanlock() + except sanlock.SanlockException: + if not force: + raise + else: + self._log.warning("Force requested, overriding sanlock failure.") data = {} @@ -333,7 +339,12 @@ # Free lockspace self._log.debug("Releasing sanlock") - self._release_sanlock() + try: + self._release_sanlock() + except sanlock.SanlockException: + # This could happen when force was in effect + if not force: + raise self._log.debug("Disconnecting from ha-broker") if self._broker and self._broker.is_connected(): -- To view, visit https://gerrit.ovirt.org/42202 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c91ff4251f568c404cefb4c8b567cba2db35fc8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-hosted-engine-ha Gerrit-Branch: master Gerrit-Owner: Martin Sivák <msi...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
