ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/setup: Lower per_node_2G_alloc to per_node_1G_alloc

Browse Source 
For some systems, depending on the mem distribution, 2GB per node may be too much. Just lower it to 1GB as the only thing we are verifying here
is HUGENODE usage in this test.

Also, make sure we always log output from setup.sh.

Change-Id: If7c382b442e9523fe5ad5df03110a8cc5467f1d9
Signed-off-by: Michal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17367
Reviewed-by: Jaroslaw Chachulski <jaroslawx.chachulski@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
This commit is contained in:
Michal Berger 2023-03-28 17:22:26 +02:00 committed by Konrad Sztyber
parent c6591af05b
commit 45dc5f12ff
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/setup/hugepages.sh
View File

@ -136,30 +136,30 @@ verify_nr_hugepages() {
default_setup() { default_setup() {
# Default HUGEMEM (2G) alloc on node0 # Default HUGEMEM (2G) alloc on node0
get_test_nr_hugepages $((2048 * 1024)) 0 get_test_nr_hugepages $((2048 * 1024)) 0
setup setup output
verify_nr_hugepages verify_nr_hugepages
} }
per_node_2G_alloc() { per_node_1G_alloc() {
# 2G alloc per node, total N*2G pages # 1G alloc per node, total N*1G pages
local IFS="," local IFS=","
get_test_nr_hugepages $((2048 * 1024)) "${!nodes_sys[@]}" get_test_nr_hugepages $((1024 * 1024)) "${!nodes_sys[@]}"
NRHUGE=$nr_hugepages HUGENODE="${!nodes_sys[*]}" setup NRHUGE=$nr_hugepages HUGENODE="${!nodes_sys[*]}" setup output
nr_hugepages=$((nr_hugepages * ${#nodes_sys[@]})) verify_nr_hugepages nr_hugepages=$((nr_hugepages * ${#nodes_sys[@]})) verify_nr_hugepages
} }
even_2G_alloc() { even_2G_alloc() {
# 2G alloc spread across N nodes # 2G alloc spread across N nodes
get_test_nr_hugepages $((2048 * 1024)) get_test_nr_hugepages $((2048 * 1024))
NRHUGE=$nr_hugepages HUGE_EVEN_ALLOC=yes setup NRHUGE=$nr_hugepages HUGE_EVEN_ALLOC=yes setup output
verify_nr_hugepages verify_nr_hugepages
} }
odd_alloc() { odd_alloc() {
# Odd 2049MB alloc across N nodes # Odd 2049MB alloc across N nodes
get_test_nr_hugepages $((2049 * 1024)) get_test_nr_hugepages $((2049 * 1024))
HUGEMEM=2049 HUGE_EVEN_ALLOC=yes setup HUGEMEM=2049 HUGE_EVEN_ALLOC=yes setup output
verify_nr_hugepages verify_nr_hugepages
} }
@ -186,7 +186,7 @@ custom_alloc() {
done done
get_test_nr_hugepages_per_node get_test_nr_hugepages_per_node
HUGENODE="${HUGENODE[*]}" setup HUGENODE="${HUGENODE[*]}" setup output
nr_hugepages=$_nr_hugepages verify_nr_hugepages nr_hugepages=$_nr_hugepages verify_nr_hugepages
} }
@ -197,11 +197,11 @@ no_shrink_alloc() {
get_test_nr_hugepages $((2048 * 1024)) 0 get_test_nr_hugepages $((2048 * 1024)) 0
# Verify the default first # Verify the default first
setup setup output
verify_nr_hugepages verify_nr_hugepages
# Now attempt to shrink the hp number # Now attempt to shrink the hp number
CLEAR_HUGE=no NRHUGE=$((nr_hugepages / 2)) setup CLEAR_HUGE=no NRHUGE=$((nr_hugepages / 2)) setup output
# 2G should remain # 2G should remain
verify_nr_hugepages verify_nr_hugepages
} }
@ -210,7 +210,7 @@ get_nodes
clear_hp clear_hp
run_test "default_setup" default_setup run_test "default_setup" default_setup
run_test "per_node_2G_alloc" per_node_2G_alloc run_test "per_node_1G_alloc" per_node_1G_alloc
run_test "even_2G_alloc" even_2G_alloc run_test "even_2G_alloc" even_2G_alloc
run_test "odd_alloc" odd_alloc run_test "odd_alloc" odd_alloc
run_test "custom_alloc" custom_alloc run_test "custom_alloc" custom_alloc