IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-23 07:33:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Provide more detailed logging around memory detection

Browse Source 
This should make it easier to troubleshoot low memory installation
failures from the logs.

https://pagure.io/freeipa/issue/8404

Signed-off-by: Rob Crittenden <rcritten@redhat.com>
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
This commit is contained in:
Rob Crittenden 2021-01-28 10:03:44 -05:00
parent 98a88bd719
commit 75c1b7ed34
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipaserver/install/installutils.py
View File

@ -1077,16 +1077,19 @@ def check_available_memory(ca=False):
if not ca: if not ca:
minimum_suggested -= 150 * 1000 * 1000 minimum_suggested -= 150 * 1000 * 1000
if in_container(): if in_container():
logger.debug("container detected")
# cgroup v1 # cgroup v1
if os.path.exists( if os.path.exists(
'/sys/fs/cgroup/memory/memory.limit_in_bytes' '/sys/fs/cgroup/memory/memory.limit_in_bytes'
) and os.path.exists('/sys/fs/cgroup/memory/memory.usage_in_bytes'): ) and os.path.exists('/sys/fs/cgroup/memory/memory.usage_in_bytes'):
logger.debug("cgroup v1")
limit_file = '/sys/fs/cgroup/memory/memory.limit_in_bytes' limit_file = '/sys/fs/cgroup/memory/memory.limit_in_bytes'
usage_file = '/sys/fs/cgroup/memory/memory.usage_in_bytes' usage_file = '/sys/fs/cgroup/memory/memory.usage_in_bytes'
# cgroup v2 # cgroup v2
elif os.path.exists( elif os.path.exists(
'/sys/fs/cgroup/memory.current' '/sys/fs/cgroup/memory.current'
) and os.path.exists('/sys/fs/cgroup/memory.max'): ) and os.path.exists('/sys/fs/cgroup/memory.max'):
logger.debug("cgroup v2")
limit_file = '/sys/fs/cgroup/memory.max' limit_file = '/sys/fs/cgroup/memory.max'
usage_file = '/sys/fs/cgroup/memory.current' usage_file = '/sys/fs/cgroup/memory.current'
else: else:
@ -1105,11 +1108,14 @@ def check_available_memory(ca=False):
if limit != 'max': if limit != 'max':
available = int(limit) - used available = int(limit) - used
logger.debug("Max RAM %s, used RAM %s", limit, used)
if available is None: if available is None:
# delay import of psutil. On import it opens files in /proc and # delay import of psutil. On import it opens files in /proc and
# can trigger a SELinux violation. # can trigger a SELinux violation.
import psutil import psutil
available = psutil.virtual_memory().available available = psutil.virtual_memory().available
logger.debug(psutil.virtual_memory())
if available is None: if available is None:
raise ScriptError( raise ScriptError(