Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: expose total memory in env ......................................................................
packaging: setup: expose total memory in env Change-Id: Ia25b24fb263390c9f6ae50708e2c3791d2c7a987 Bug-Url: https://bugzilla.redhat.com/1185411 Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/memcheck.py 2 files changed, 21 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/37437/1 diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index 61f2fed..54d296d 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -431,6 +431,7 @@ return 'OVESETUP_CONFIG/remoteEngineHostRootPassword' ISO_PATHS_TO_UPLOAD = 'OVESETUP_CONFIG/isoPathsToUpload' + TOTAL_MEMORY_MB = 'OVESETUP_CONFIG/totalMemoryMB' @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/memcheck.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/memcheck.py index 5a1af96..acfe4cc 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/memcheck.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/memcheck.py @@ -53,11 +53,13 @@ def __init__(self, context): super(Plugin, self).__init__(context=context) - self._total_memory = 0 + self.environment[osetupcons.ConfigEnv.TOTAL_MEMORY_MB] = 0 def _check_requirements(self): satisfied = False - if self._total_memory < self.environment[ + if self.environment[ + osetupcons.ConfigEnv.TOTAL_MEMORY_MB + ] < self.environment[ oenginecons.SystemEnv.MEMCHECK_MINIMUM_MB ] * self.environment[ oenginecons.SystemEnv.MEMCHECK_THRESHOLD @@ -78,7 +80,9 @@ ) else: satisfied = True - if self._total_memory < self.environment[ + if self.environment[ + osetupcons.ConfigEnv.TOTAL_MEMORY_MB + ] < self.environment[ oenginecons.SystemEnv.MEMCHECK_RECOMMENDED_MB ] * self.environment[ oenginecons.SystemEnv.MEMCHECK_THRESHOLD @@ -116,14 +120,9 @@ ) @plugin.event( - stage=plugin.Stages.STAGE_VALIDATION, - name=oenginecons.Stages.MEMORY_CHECK, - condition=lambda self: self.environment[oenginecons.CoreEnv.ENABLE], + stage=plugin.Stages.STAGE_SETUP, ) - def _validateMemory(self): - """ - Check if the system met the memory requirements. - """ + def _setup(self): self.logger.debug('Checking total memory') with open('/proc/meminfo', 'r') as f: content = f.read() @@ -132,12 +131,21 @@ if match is None: raise RuntimeError(_("Unable to parse /proc/meminfo")) - self._total_memory = int( + self.environment[osetupcons.ConfigEnv.TOTAL_MEMORY_MB] = int( match.group('value') ) if match.group('unit') == "kB": - self._total_memory //= 1024 + self.environment[osetupcons.ConfigEnv.TOTAL_MEMORY_MB] //= 1024 + @plugin.event( + stage=plugin.Stages.STAGE_VALIDATION, + name=oenginecons.Stages.MEMORY_CHECK, + condition=lambda self: self.environment[oenginecons.CoreEnv.ENABLE], + ) + def _validateMemory(self): + """ + Check if the system met the memory requirements. + """ self._satisfied = self._check_requirements() @plugin.event( -- To view, visit http://gerrit.ovirt.org/37437 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia25b24fb263390c9f6ae50708e2c3791d2c7a987 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
