327f69ea41
In some occasions the total number of available hugepages increases by the account of reserved and/or surplus hugepages allocated by the kernel. This affects the test where it ends up with bigger number of hugepages then actually requested via setup.sh. Hugepages overcommitting is disabled under CI nodes, however, this issue spontaneously appears regardless. To rectify, add the extra hugepages while checking the expected number + some debug to see the state of meminfo in case the test still fails. Signed-off-by: Michal Berger <michal.berger@intel.com> Change-Id: If30a422240045ac188a9175eeab7210351eb34a6 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13826 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
81 lines
1.7 KiB
Bash
81 lines
1.7 KiB
Bash
source "$rootdir/test/common/autotest_common.sh"
|
|
|
|
setup() {
|
|
if [[ $1 == output ]]; then
|
|
"$rootdir/scripts/setup.sh" "${@:2}"
|
|
else
|
|
"$rootdir/scripts/setup.sh" "$@" &> /dev/null
|
|
fi
|
|
}
|
|
|
|
get_meminfo() {
|
|
xtrace_disable
|
|
|
|
local get=$1
|
|
local node=$2
|
|
local var val
|
|
local mem_f mem
|
|
|
|
mem_f=/proc/meminfo
|
|
if [[ -e /sys/devices/system/node/node$node/meminfo ]]; then
|
|
mem_f=/sys/devices/system/node/node$node/meminfo
|
|
elif [[ -n $node ]]; then
|
|
return 1
|
|
fi
|
|
mapfile -t mem < "$mem_f"
|
|
mem=("${mem[@]#Node +([0-9]) }")
|
|
|
|
while IFS=": " read -r var val _; do
|
|
[[ $var == "$get" ]] || continue
|
|
echo "$val" && return 0
|
|
done < <(printf '%s\n' "${mem[@]}")
|
|
return 1
|
|
|
|
xtrace_restore
|
|
}
|
|
|
|
partition_drive() {
|
|
local disk=$1
|
|
local part_no=${2:-2}
|
|
local size=${3:-1073741824} # default 1G
|
|
|
|
local part part_start=0 part_end=0
|
|
local parts=()
|
|
|
|
for ((part = 1; part <= part_no; part++)); do
|
|
parts+=("${disk}p$part")
|
|
done
|
|
|
|
# Convert size to sectors for more precise partitioning
|
|
((size /= $(< "/sys/class/block/$disk/queue/physical_block_size")))
|
|
|
|
"$rootdir/scripts/sync_dev_uevents.sh" block/partition "${parts[@]}" &
|
|
|
|
# Avoid parted since it generates to much noise over netlink
|
|
sgdisk "/dev/$disk" --zap-all || :
|
|
for ((part = 1; part <= part_no; part++)); do
|
|
((part_start = part_start == 0 ? 2048 : part_end + 1))
|
|
((part_end = part_start + size - 1))
|
|
sgdisk "/dev/$disk" --new="$part:$part_start:$part_end"
|
|
done
|
|
wait "$!"
|
|
}
|
|
|
|
mkfs() {
|
|
local dev=$1 mount=$2 size=$3
|
|
|
|
mkdir -p "$mount"
|
|
|
|
[[ -e $dev ]]
|
|
mkfs.ext4 -qF "$dev" $size
|
|
mount "$dev" "$mount"
|
|
}
|
|
|
|
sec_size_to_bytes() {
|
|
local dev=$1
|
|
|
|
[[ -e /sys/block/$dev ]] || return 1
|
|
# /size is always represented in 512B blocks
|
|
echo $(($(< "/sys/block/$dev/size") * 512))
|
|
}
|