66 lines
3.0 KiB
Diff
66 lines
3.0 KiB
Diff
From e3936ebbd880bc79c2972af1bccc86fae733bf34 Mon Sep 17 00:00:00 2001
|
|
From: Petr Stodulka <pstodulk@redhat.com>
|
|
Date: Tue, 8 Nov 2022 17:44:28 +0100
|
|
Subject: [PATCH] Fix the check of memory (RAM) limits
|
|
|
|
The checkmem actor was incorrect as the limits have been written
|
|
in MiBs however the value obtained from /proc/meminfo is in KiBs.
|
|
So the actual check has been incorrect.
|
|
|
|
Also the memory limits have been changed since the creation of the
|
|
actor. Updating the values in KiBs based on the current table:
|
|
https://access.redhat.com/articles/rhel-limits
|
|
|
|
The report msg has been updated to print the values in MiB instead
|
|
of KiB.
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2139907
|
|
---
|
|
.../checkmemory/libraries/checkmemory.py | 21 ++++++++++++-------
|
|
1 file changed, 13 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/repos/system_upgrade/common/actors/checkmemory/libraries/checkmemory.py b/repos/system_upgrade/common/actors/checkmemory/libraries/checkmemory.py
|
|
index ea8bfe69..1045e5c6 100644
|
|
--- a/repos/system_upgrade/common/actors/checkmemory/libraries/checkmemory.py
|
|
+++ b/repos/system_upgrade/common/actors/checkmemory/libraries/checkmemory.py
|
|
@@ -5,10 +5,10 @@ from leapp.libraries.stdlib import api
|
|
from leapp.models import MemoryInfo
|
|
|
|
min_req_memory = {
|
|
- architecture.ARCH_X86_64: 1536, # 1.5G
|
|
- architecture.ARCH_ARM64: 2048, # 2Gb
|
|
- architecture.ARCH_PPC64LE: 2048, # 2Gb
|
|
- architecture.ARCH_S390X: 1024 # 1Gb
|
|
+ architecture.ARCH_X86_64: 1572864, # 1.5G
|
|
+ architecture.ARCH_ARM64: 1572864, # 1.5G
|
|
+ architecture.ARCH_PPC64LE: 3145728, # 3G
|
|
+ architecture.ARCH_S390X: 1572864, # 1.5G
|
|
}
|
|
|
|
|
|
@@ -33,12 +33,17 @@ def process():
|
|
|
|
if minimum_req_error:
|
|
title = 'Minimum memory requirements for RHEL {} are not met'.format(version.get_target_major_version())
|
|
- summary = 'Memory detected: {} KiB, required: {} KiB'.format(minimum_req_error['detected'],
|
|
- minimum_req_error['minimal_req'])
|
|
+ summary = 'Memory detected: {} MiB, required: {} MiB'.format(
|
|
+ int(minimum_req_error['detected'] / 1024), # noqa: W1619; pylint: disable=old-division
|
|
+ int(minimum_req_error['minimal_req'] / 1024), # noqa: W1619; pylint: disable=old-division
|
|
+ )
|
|
reporting.create_report([
|
|
reporting.Title(title),
|
|
reporting.Summary(summary),
|
|
reporting.Severity(reporting.Severity.HIGH),
|
|
- reporting.Groups([reporting.Groups.SANITY]),
|
|
- reporting.Groups([reporting.Groups.INHIBITOR]),
|
|
+ reporting.Groups([reporting.Groups.SANITY, reporting.Groups.INHIBITOR]),
|
|
+ reporting.ExternalLink(
|
|
+ url='https://access.redhat.com/articles/rhel-limits',
|
|
+ title='Red Hat Enterprise Linux Technology Capabilities and Limits'
|
|
+ ),
|
|
])
|
|
--
|
|
2.39.0
|
|
|