Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: Do not create a new db on upgrade ......................................................................
packaging: setup: Do not create a new db on upgrade Before this change, the following scenario made engine-setup emit a warning and create a new db: 1. engine-setup 2. service ovirt-engine stop; service postgresql stop 3. engine-setup This change changes changes the warning to an error (exception) unless it's during cleanup. Bug-Url: https://bugzilla.redhat.com/1014012 Change-Id: Ia336e951860f6e1a6a829cabf5e6b5e10592089b Signed-off-by: Yedidyah Bar David <d...@redhat.com> --- M packaging/setup/plugins/ovirt-engine-common/db/connection.py 1 file changed, 14 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/19839/1 diff --git a/packaging/setup/plugins/ovirt-engine-common/db/connection.py b/packaging/setup/plugins/ovirt-engine-common/db/connection.py index ce9800f..0031ef9 100644 --- a/packaging/setup/plugins/ovirt-engine-common/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/db/connection.py @@ -132,17 +132,21 @@ 'Existing credential use failed', exc_info=True, ) - self.logger.warning( - _( - 'Cannot connect to database using existing ' - 'credentials: {user}@{host}:{port}' - ).format( - host=dbenv[osetupcons.DBEnv.HOST], - port=dbenv[osetupcons.DBEnv.PORT], - database=dbenv[osetupcons.DBEnv.DATABASE], - user=dbenv[osetupcons.DBEnv.USER], - ), + msg = _( + 'Cannot connect to database using existing ' + 'credentials: {user}@{host}:{port}' + ).format( + host=dbenv[osetupcons.DBEnv.HOST], + port=dbenv[osetupcons.DBEnv.PORT], + database=dbenv[osetupcons.DBEnv.DATABASE], + user=dbenv[osetupcons.DBEnv.USER], ) + if self.environment[ + osetupcons.CoreEnv.ACTION + ] == osetupcons.Const.ACTION_REMOVE: + self.logger.warning(msg) + else: + raise RuntimeError(msg) # vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit http://gerrit.ovirt.org/19839 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia336e951860f6e1a6a829cabf5e6b5e10592089b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <d...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
