Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: unset DisconnectDwh on failure ......................................................................
packaging: setup: unset DisconnectDwh on failure Change-Id: I09083bc79ead4711a7a998fab112c58ef80b0b4d Bug-Url: https://bugzilla.redhat.com/1167801 Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dwh.py 1 file changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/35583/1 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dwh.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dwh.py index 44ec6ea..1c25e79 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dwh.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dwh.py @@ -106,11 +106,14 @@ hostname=self._dwh_host, ) ) - self._update_DisconnectDwh('1') - retries = self.RETRIES - while self._remote_dwh_is_up() and retries > 0: - retries -= 1 - time.sleep(self.DELAY) + try: + self._update_DisconnectDwh('1') + retries = self.RETRIES + while self._remote_dwh_is_up() and retries > 0: + retries -= 1 + time.sleep(self.DELAY) + finally: + self._update_DisconnectDwh('0') if self._remote_dwh_is_up(): self.logger.error( _( @@ -122,7 +125,6 @@ ) ) raise RuntimeError(_('dwhd is currently running')) - self._update_DisconnectDwh('0') self.logger.info(_('Stopped DWH')) self._remote_dwh_stopped = True -- To view, visit http://gerrit.ovirt.org/35583 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I09083bc79ead4711a7a998fab112c58ef80b0b4d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
