Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: Stop services only when needed ......................................................................
packaging: setup: Stop services only when needed Added env key for stopping dwhd. Stopping dwhd defaults to False and is set to True in setup/cleanup if needed. Change-Id: I1925ca82cb48027e4fef2c439f3d83e8058fadd9 Bug-Url: https://bugzilla.redhat.com/1198107 Bug-Url: https://bugzilla.redhat.com/956226 Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/ovirt_engine_setup/dwh/constants.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py 4 files changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/30/42430/1 diff --git a/packaging/setup/ovirt_engine_setup/dwh/constants.py b/packaging/setup/ovirt_engine_setup/dwh/constants.py index 8b865a5..ad83e6e 100644 --- a/packaging/setup/ovirt_engine_setup/dwh/constants.py +++ b/packaging/setup/ovirt_engine_setup/dwh/constants.py @@ -223,6 +223,8 @@ def OVIRT_ENGINE_DWH_DB_BACKUP_DIR(self): return 'OVESETUP_DWH_CONFIG/dwhDbBackupDir' + DWH_SERVICE_STOP_NEEDED = 'OVESETUP_DWH_CONFIG/dwhServiceStopNeeded' + @util.export @util.codegen diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py index aaac42d..f3f94df 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py @@ -38,12 +38,23 @@ super(Plugin, self).__init__(context=context) @plugin.event( + stage=plugin.Stages.STAGE_INIT, + ) + def _init(self): + self.environment.setdefault( + odwhcons.ConfigEnv.DWH_SERVICE_STOP_NEEDED, + False + ) + + @plugin.event( stage=plugin.Stages.STAGE_TRANSACTION_BEGIN, before=( osetupcons.Stages.SYSTEM_HOSTILE_SERVICES_DETECTION, ), condition=lambda self: not self.environment[ osetupcons.CoreEnv.DEVELOPER_MODE + ] and self.environment[ + odwhcons.ConfigEnv.DWH_SERVICE_STOP_NEEDED ], ) def _transactionBegin(self): diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py index 8566e76..0d81a23 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py @@ -84,6 +84,8 @@ false=_('No'), default=False, ) + if self.environment[odwhcons.RemoveEnv.REMOVE_DATABASE]: + self.environment[odwhcons.ConfigEnv.DWH_SERVICE_STOP_NEEDED] = True @plugin.event( stage=plugin.Stages.STAGE_MISC, diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py index 0d08676..1406c72 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py @@ -62,6 +62,8 @@ prompt=True, default=True, ) + if self.environment[odwhcons.CoreEnv.ENABLE]: + self.environment[odwhcons.ConfigEnv.DWH_SERVICE_STOP_NEEDED] = True # vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit https://gerrit.ovirt.org/42430 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1925ca82cb48027e4fef2c439f3d83e8058fadd9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
