Simone Tiraboschi has uploaded a new change for review. Change subject: packaging: setup: Making waitEngineUp more robust ......................................................................
packaging: setup: Making waitEngineUp more robust On a all-in-one setup engine-setup uses oVirt SDK to add the host so engine-setup should waint for the engine before adding the host. Trying to cennect during oVirt webapp startup, oVirt SDK can raise a range of excpetion and some of them can break the wait loop. Fixing it catching also them. Change-Id: I821b9e64dc39b0431a8d9b73d64699ca6dcd5ec3 Bug-url: https://bugzilla.redhat.com/1113882 Signed-off-by: Simone Tiraboschi <[email protected]> --- M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsm.py 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/29517/1 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsm.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsm.py index 3d2a428..86c1068 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsm.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsm.py @@ -45,7 +45,7 @@ """ ENGINE_RETRIES = 60 - ENGINE_DELAY = 5 + ENGINE_DELAY = 3 VDSM_RETRIES = 600 VDSM_DELAY = 1 @@ -128,7 +128,12 @@ insecure=True, ) isUp = True - except self._ovirtsdk_errors.RequestError: + except ( + self._ovirtsdk_errors.DisconnectedError, + self._ovirtsdk_errors.ConnectionError, + self._ovirtsdk_errors.RequestError, + self._ovirtsdk_errors.FormatError, + ): self.logger.debug( 'Cannot connect to engine', exc_info=True, -- To view, visit http://gerrit.ovirt.org/29517 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I821b9e64dc39b0431a8d9b73d64699ca6dcd5ec3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Simone Tiraboschi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
