starlingx
/
config
Code Issues Proposed changes

Merge "Increase platform memory reserve on AIO hosts"

This commit is contained in:
Zuul 2021-04-15 20:48:50 +00:00 committed by Gerrit Code Review
parent 0033feed50 d1a13c9b3f
commit bf809916d8
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysinv/sysinv/sysinv/sysinv/common/constants.py
View File

@ -242,7 +242,7 @@ PLATFORM_CORE_MEMORY_RESERVED_MIB_VBOX = 1100
PLATFORM_CORE_MEMORY_RESERVED_MIB_VBOX_WORKER = 2000
# For AIO config, memory reserved for controller in MiB
COMBINED_NODE_CONTROLLER_MEMORY_RESERVED_MIB = 4000
COMBINED_NODE_CONTROLLER_MEMORY_RESERVED_MIB = 5000
COMBINED_NODE_CONTROLLER_MEMORY_RESERVED_MIB_VBOX = 3000
COMBINED_NODE_CONTROLLER_MEMORY_RESERVED_MIB_XEOND = 3000

11
sysinv/sysinv/sysinv/sysinv/common/utils.py
View File

@ -1037,16 +1037,14 @@ def get_required_platform_reserved_memory(dbapi, ihost, numa_node, low_core=Fals
required_reserved += \
constants.DISTRIBUTED_CLOUD_CONTROLLER_MEMORY_RESERVED_MIB // numa_node_count
elif host_has_function(ihost, constants.WORKER):
# Engineer 2G per numa node for disk IO RSS overhead
# Engineer reserve per numa node for disk IO RSS overhead
required_reserved += constants.DISK_IO_RESIDENT_SET_SIZE_MIB
if numa_node == 0:
# Engineer 2G for worker to give some headroom;
# typically requires 650 MB PSS
# Engineer platform reserve for worker
required_reserved += \
constants.PLATFORM_CORE_MEMORY_RESERVED_MIB
if host_has_function(ihost, constants.CONTROLLER):
# Over-engineer controller memory.
# Typically require 5GB PSS; accommodate 2GB headroom.
# If AIO, reserve additional memory for controller function.
# Controller memory usage depends on number of workers.
if low_core:
required_reserved += \
@ -1055,8 +1053,7 @@ def get_required_platform_reserved_memory(dbapi, ihost, numa_node, low_core=Fals
required_reserved += \
constants.COMBINED_NODE_CONTROLLER_MEMORY_RESERVED_MIB
else:
# If not a controller,
# add overhead for metadata and vrouters
# If not a controller, add overhead for metadata and vrouters
required_reserved += \
constants.NETWORK_METADATA_OVERHEAD_MIB
elif ihost['personality'] == constants.CONTROLLER: