Skip to content

OCPBUGS-62790: Restore agent MASTER_MEMORY default to 16GiB #1819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zaneb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OCPBUGS-62790: Restore agent MASTER_MEMORY default to 16GiB #1819

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,28 +472,28 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
export NUM_MASTERS=5
export MASTER_VCPU=${MASTER_VCPU:-4}
export MASTER_DISK=${MASTER_DISK:-100}
export MASTER_MEMORY=${MASTER_MEMORY:-24576}
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
export NUM_WORKERS=0
;;
"4CONTROL" )
export NUM_MASTERS=4
export MASTER_VCPU=${MASTER_VCPU:-4}
export MASTER_DISK=${MASTER_DISK:-100}
export MASTER_MEMORY=${MASTER_MEMORY:-24576}
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
export NUM_WORKERS=0
;;
"COMPACT" )
export NUM_MASTERS=3
export MASTER_VCPU=${MASTER_VCPU:-4}
export MASTER_DISK=${MASTER_DISK:-100}
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
export NUM_WORKERS=0
;;
"TNA" )
export NUM_MASTERS=2
export MASTER_VCPU=${MASTER_VCPU:-8}
export MASTER_DISK=${MASTER_DISK:-100}
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
export NUM_ARBITERS=1
export ARBITER_VCPU=${ARBITER_VCPU:-2}
export ARBITER_MEMORY=${ARBITER_MEMORY:-8192}
Expand All @@ -505,7 +505,7 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
export NUM_MASTERS=2
export MASTER_VCPU=${MASTER_VCPU:-8}
export MASTER_DISK=${MASTER_DISK:-100}
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
export NUM_WORKERS=${NUM_WORKERS:-0}
export WORKER_DISK=${WORKER_DISK:-100}
export ENABLE_TWO_NODE_FENCING="true"
Expand All @@ -514,17 +514,17 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
export NUM_MASTERS=3
export MASTER_VCPU=${MASTER_VCPU:-4}
export MASTER_DISK=${MASTER_DISK:-100}
export MASTER_MEMORY=${MASTER_MEMORY:-24576}
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
export NUM_WORKERS=2
export WORKER_VCPU=${WORKER_VCPU:-4}
export WORKER_DISK=${WORKER_DISK:-100}
export WORKER_MEMORY=${WORKER_MEMORY:-16384}
export WORKER_MEMORY=${WORKER_MEMORY:-8192}
;;
"SNO" )
export NUM_MASTERS=1
export MASTER_VCPU=${MASTER_VCPU:-8}
export MASTER_DISK=${MASTER_DISK:-100}
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
export NUM_WORKERS=0
export NETWORK_TYPE="OVNKubernetes"
export AGENT_PLATFORM_TYPE="${AGENT_PLATFORM_TYPE:-"none"}"
Expand All @@ -541,7 +541,7 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
export NUM_MASTERS=1
export MASTER_VCPU=${MASTER_VCPU:-4}
export MASTER_DISK=${MASTER_DISK:-100}
export MASTER_MEMORY=${MASTER_MEMORY:-32768}
export MASTER_MEMORY=${MASTER_MEMORY:-16384}
export NUM_WORKERS=0
export NETWORK_TYPE="OVNKubernetes"
export AGENT_PLATFORM_TYPE="${AGENT_PLATFORM_TYPE:-"none"}"
Expand All @@ -560,12 +560,24 @@ if [[ ! -z ${AGENT_E2E_TEST_SCENARIO} ]]; then
if ((MASTER_VCPU < 10)); then
export MASTER_VCPU=10
fi
if ((MASTER_MEMORY < 17658)); then
# CNV requires 150MiB
# MTV requires 1024MiB
# LVM requires 100MiB (compact/SNO only)
export MASTER_MEMORY=17658
fi
if [ "${SCENARIO}" == "SNO" ]; then
if ((MASTER_VCPU < 16)); then
export MASTER_VCPU=16
fi
fi
if [ "${SCENARIO}" == "HA" ]; then
if ((WORKER_MEMORY < 9676)); then
# CNV requires 360MiB
# MTV requires 1024MiB
# LVM requires 100MiB
export WORKER_MEMORY=9676
fi
if ((WORKER_VCPU < 5)); then
export WORKER_VCPU=5
fi
Expand Down