Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: setup: database: backup reuse ......................................................................
packaging: setup: database: backup reuse Change-Id: I524565f07266aae831b90a7ee874e31662807bc7 Signed-off-by: Alon Bar-Lev <[email protected]> --- M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/ovirt_engine_setup/database.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py 4 files changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/22986/1 diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index 95023ca..74eaf4d 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -646,6 +646,7 @@ FIREWALL_MANAGER_IPTABLES = 'iptables' FIREWALL_MANAGER_FIREWALLD = 'firewalld' ISO_DOMAIN_NFS_DEFAULT_ACL = '0.0.0.0/0.0.0.0(rw)' + ENGINE_DB_BACKUP_PREFIX = 'engine' @util.export diff --git a/packaging/setup/ovirt_engine_setup/database.py b/packaging/setup/ovirt_engine_setup/database.py index e7960da..3328997 100644 --- a/packaging/setup/ovirt_engine_setup/database.py +++ b/packaging/setup/ovirt_engine_setup/database.py @@ -472,7 +472,8 @@ def backup( self, - prefix='engine', + dir, + prefix, ): fd, backupFile = tempfile.mkstemp( prefix='%s-%s.' % ( @@ -480,7 +481,7 @@ datetime.datetime.now().strftime('%Y%m%d%H%M%S') ), suffix='.sql', - dir=osetupcons.FileLocations.OVIRT_ENGINE_DB_BACKUP_DIR, + dir=dir, ) os.close(fd) diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py index 11a0941..b32cec9 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py @@ -96,7 +96,10 @@ try: dbovirtutils = database.OvirtUtils(plugin=self) dbovirtutils.tryDatabaseConnect() - self._bkpfile = dbovirtutils.backup() + self._bkpfile = dbovirtutils.backup( + dir=osetupcons.FileLocations.OVIRT_ENGINE_DB_BACKUP_DIR, + prefix=osetupcons.Const.ENGINE_DB_BACKUP_PREFIX, + ) self.logger.info( _('Clearing Engine database {database}').format( database=self.environment[osetupcons.DBEnv.DATABASE], diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py index 1d7a591..3841c7a 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py @@ -273,7 +273,10 @@ def _miscUpgrade(self): self._checkSupportedVersionsPresent() dbovirtutils = database.OvirtUtils(plugin=self) - backupFile = dbovirtutils.backup() + backupFile = dbovirtutils.backup( + dir=osetupcons.FileLocations.OVIRT_ENGINE_DB_BACKUP_DIR, + prefix=osetupcons.Const.ENGINE_DB_BACKUP_PREFIX, + ) self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append( self.SchemaTransaction( -- To view, visit http://gerrit.ovirt.org/22986 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I524565f07266aae831b90a7ee874e31662807bc7 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
