Alex Lourie has uploaded a new change for review.

Change subject: packaging: updating recovery steps for failed db restore
......................................................................

packaging: updating recovery steps for failed db restore

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


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/7677/1

diff --git a/packaging/fedora/setup/engine-upgrade.py 
b/packaging/fedora/setup/engine-upgrade.py
index 6f0d06e..3130e81 100755
--- a/packaging/fedora/setup/engine-upgrade.py
+++ b/packaging/fedora/setup/engine-upgrade.py
@@ -775,13 +775,21 @@
         print MSG_ERROR_UPGRADE
         print MSG_INFO_REASON%(sys.exc_info()[1])
 
-        # db restore
+        # allow db restore
         if isUpdateRelatedToDb(rhyum):
-            runFunc([db.restore], MSG_INFO_DB_RESTORE)
+            try:
+                runFunc([db.restore], MSG_INFO_DB_RESTORE)
+            except:
+                # This Exception have already been logged, so just pass along
+                pass
 
-        # yum rollback
+        # allow yum rollback even if db restore failed
         if options.yum_rollback:
-            runFunc([rhyum.rollback], MSG_INFO_YUM_ROLLBACK)
+            try:
+                runFunc([rhyum.rollback], MSG_INFO_YUM_ROLLBACK)
+            except:
+                # This Exception have already been logged, so just pass along
+                pass
         else:
             print MSG_INFO_NO_YUM_ROLLBACK
             logging.debug("Skipping yum rollback")


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

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