Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: rollback database if only pki upgrade took place ......................................................................
packaging: rollback database if only pki upgrade took place Currently if database packages is not upgraded the changes of pki will not be rolled backed. This change performs database backup/restore if pki is to be changed. Change-Id: Iae1f7ee7d0136922ca929f755f326acda77bbb7e Signed-off-by: Alon Bar-Lev <[email protected]> --- M packaging/fedora/setup/engine-upgrade.py 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/8276/1 diff --git a/packaging/fedora/setup/engine-upgrade.py b/packaging/fedora/setup/engine-upgrade.py index cc4210e..b5eec6d 100755 --- a/packaging/fedora/setup/engine-upgrade.py +++ b/packaging/fedora/setup/engine-upgrade.py @@ -552,6 +552,9 @@ JKSKEYSTORE = "/etc/pki/ovirt-engine/.keystore" TMPAPACHECONF = basedefs.FILE_HTTPD_SSL_CONFIG + ".tmp" + def mayUpdateDB(self): + return os.path.exists(self.JKSKEYSTORE) + def prepare(self): if os.path.exists(self.JKSKEYSTORE): logging.debug("PKI: convert JKS to PKCS#12") @@ -846,6 +849,8 @@ print MSG_ERROR_CHECK_LOG%(LOG_FILE) sys.exit(2) + updateRelatedToDB = isUpdateRelatedToDb(rhyum) or ca.mayUpdateDB() + # No rollback in this case try: # We ask the user before stoping ovirt-engine or take command line option @@ -859,7 +864,7 @@ sys.exit(0) # Backup DB - if isUpdateRelatedToDb(rhyum): + if updateRelatedToDB: stopDbRelatedServices(etlService, notificationService) runFunc([db.backup], MSG_INFO_BACKUP_DB) runFunc([[db.rename, DB_NAME_TEMP]], MSG_INFO_RENAME_DB) @@ -877,7 +882,7 @@ rhyum.updated = True # check if update is relevant to db update - if isUpdateRelatedToDb(rhyum): + if updateRelatedToDB: # Update the db and restore its name back runFunc([db.update], MSG_INFO_DB_UPDATE) @@ -903,7 +908,7 @@ runFunc([ca.rollback], MSG_INFO_PKI_ROLLBACK) # allow db restore - if isUpdateRelatedToDb(rhyum): + if updateRelatedToDB: try: runFunc([db.restore], MSG_INFO_DB_RESTORE) except: -- To view, visit http://gerrit.ovirt.org/8276 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae1f7ee7d0136922ca929f755f326acda77bbb7e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
