Alex Lourie has uploaded a new change for review. Change subject: packaging: Updated order of services starting ......................................................................
packaging: Updated order of services starting In a current upgrade flows the ovirt-engine-dwhd service was started before ovirt-engine. This patch changes the order of the services starting ovirt-engine first, and adding a small delay (5s) before starting dwhd service (because health page should be up for dwhd to start successfully). Change-Id: I51d67f7cb88ae6aef74e2ecabff85c7828d697d2 Bug-Url: https://bugzilla.redhat.com/913384 Signed-off-by: Alex Lourie <[email protected]> --- M packaging/fedora/setup/engine-upgrade.py 1 file changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/12405/1 diff --git a/packaging/fedora/setup/engine-upgrade.py b/packaging/fedora/setup/engine-upgrade.py index f1e5835..f6aeaef 100755 --- a/packaging/fedora/setup/engine-upgrade.py +++ b/packaging/fedora/setup/engine-upgrade.py @@ -24,6 +24,10 @@ MAINTENANCE_TASKS_WAIT_PERIOD_MINUTES = MAINTENANCE_TASKS_WAIT_PERIOD / 60 MAINTENANCE_TASKS_CYCLES = 20 +# The following timeout is used for delaying the dwhd service start after +# starting ovirt-engine +WAIT_DWHD = 5 + RPM_BACKEND = "ovirt-engine-backend" RPM_DBSCRIPTS = "ovirt-engine-dbscripts" RPM_SETUP = "ovirt-engine-setup" @@ -1097,8 +1101,9 @@ checkRunningTasks() # If something went wrong, restart DB services and the engine except: - runFunc([[startDbRelatedServices, etlService, notificationService]], MSG_INFO_START_DB) runFunc(startEngineService, MSG_INFO_START_ENGINE % engineService) + time.sleep(WAIT_DWHD) + runFunc([[startDbRelatedServices, etlService, notificationService]], MSG_INFO_START_DB) raise else: # This means that user chose not to stop ovirt-engine @@ -1130,9 +1135,6 @@ runFunc([db.update], MSG_INFO_DB_UPDATE) runFunc([[db.rename, basedefs.DB_NAME]], MSG_INFO_RESTORE_DB) - # Bring up any services we shut down before db upgrade - startDbRelatedServices(etlService, notificationService) - # CA restore runFunc([ca.prepare], MSG_INFO_PKI_PREPARE) @@ -1162,6 +1164,11 @@ finally: # start engine runFunc([startEngine], MSG_INFO_START_ENGINE % engineService) + # Bring up any services we shut down before db upgrade + # Wait WAIT_DWHD seconds before starting. + time.sleep(WAIT_DWHD) + startDbRelatedServices(etlService, notificationService) + # Print log location on success addAdditionalMessages(etlService.isServiceAvailable()) -- To view, visit http://gerrit.ovirt.org/12405 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I51d67f7cb88ae6aef74e2ecabff85c7828d697d2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alex Lourie <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
