Alex Lourie has uploaded a new change for review. Change subject: packaging: setup: increase memory threshold check to 10% ......................................................................
packaging: setup: increase memory threshold check to 10% Change-Id: I5fa5ca2fd74940df47e4f137efb8346abcdc4814 Bug-Url: https://bugzilla.redhat.com/1034797 Signed-off-by: Alex Lourie <alou...@redhat.com> --- M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/plugins/ovirt-engine-setup/system/memcheck.py 2 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/22231/1 diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index cb8f9eb..d854818 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -463,6 +463,7 @@ DEFAULT_SYSTEM_MEMCHECK_MINIMUM_MB = 4096 DEFAULT_SYSTEM_MEMCHECK_RECOMMENDED_MB = 16384 + DEFAULT_SYSTEM_MEMCHECK_THRESHOLD = 90 DEFAULT_DB_NAME = 'engine' DEFAULT_DB_HOST = 'localhost' @@ -791,6 +792,7 @@ MEMCHECK_MINIMUM_MB = 'OVESETUP_SYSTEM/memCheckMinimumMB' MEMCHECK_RECOMMENDED_MB = 'OVESETUP_SYSTEM/memCheckRecommendedMB' + MEMCHECK_THRESHOLD = 'OVESETUP_SYSTEM/memCheckThreshold' SELINUX_CONTEXTS = 'OVESETUP_SYSTEM/selinuxContexts' SELINUX_RESTORE_PATHS = 'OVESETUP_SYSTEM/selinuxRestorePaths' diff --git a/packaging/setup/plugins/ovirt-engine-setup/system/memcheck.py b/packaging/setup/plugins/ovirt-engine-setup/system/memcheck.py index db6dbff..fa48cbb 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/system/memcheck.py +++ b/packaging/setup/plugins/ovirt-engine-setup/system/memcheck.py @@ -58,7 +58,9 @@ satisfied = False if self._total_memory < self.environment[ osetupcons.SystemEnv.MEMCHECK_MINIMUM_MB - ] * 0.95: + ] * self.environment[ + osetupcons.SystemEnv.MEMCHECK_THRESHOLD + ] / 100: self.logger.warn( _( 'Warning: Not enough memory is available on the host. ' @@ -77,7 +79,9 @@ satisfied = True if self._total_memory < self.environment[ osetupcons.SystemEnv.MEMCHECK_RECOMMENDED_MB - ] * 0.95: + ] * self.environment[ + osetupcons.SystemEnv.MEMCHECK_THRESHOLD + ] / 100: self.logger.warn( _( 'Less than {recommended}MB of memory is available' @@ -105,6 +109,10 @@ osetupcons.SystemEnv.MEMCHECK_RECOMMENDED_MB, osetupcons.Defaults.DEFAULT_SYSTEM_MEMCHECK_RECOMMENDED_MB ) + self.environment.setdefault( + osetupcons.SystemEnv.MEMCHECK_THRESHOLD, + osetupcons.Defaults.DEFAULT_SYSTEM_MEMCHECK_THRESHOLD + ) @plugin.event( stage=plugin.Stages.STAGE_VALIDATION, -- To view, visit http://gerrit.ovirt.org/22231 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5fa5ca2fd74940df47e4f137efb8346abcdc4814 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Alex Lourie <alou...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
