Alex Lourie has uploaded a new change for review.

Change subject: packaging: Stopped engine before restoring orig configuration
......................................................................

packaging: Stopped engine before restoring orig configuration

Added stopEngine call before we restore the original configuration
of the JBoss. Otherwise DB calls will fails.

Change-Id: I47acf36a819da2d431731828b6b85478325c0b4e
Signed-off-by: Alex Lourie <[email protected]>
---
M packaging/fedora/setup/engine-upgrade.py
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/8935/1

diff --git a/packaging/fedora/setup/engine-upgrade.py 
b/packaging/fedora/setup/engine-upgrade.py
index 9fbc03c..9482dbe 100755
--- a/packaging/fedora/setup/engine-upgrade.py
+++ b/packaging/fedora/setup/engine-upgrade.py
@@ -879,6 +879,8 @@
         finally:
             # Restore previous engine configuration
             utils.restoreEngineFromMaintenance()
+            # Stop the engine first
+            stopEngine(service)
             if origTimeout != 0:
                 utils.configureTasksTimeout(origTimeout)
 
@@ -993,9 +995,10 @@
                     try:
                         checkRunningTasks()
                     # If something went wrong, restart DB services and the 
engine
-                    finally:
+                    except:
                         runFunc([[startDbRelatedServices, etlService, 
notificationService]], MSG_INFO_START_DB)
                         runFunc(startEngineService, MSG_INFO_START_ENGINE)
+                        raise
             else:
                 # This means that user chose not to stop ovirt-engine
                 logging.debug("exiting gracefully")


--
To view, visit http://gerrit.ovirt.org/8935
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I47acf36a819da2d431731828b6b85478325c0b4e
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

Reply via email to