From 9f1a19843549b32240b2ed6954e17f09cbae3c17 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Tue, 1 Nov 2022 10:03:31 -0400 Subject: [PATCH] reef: run-make-check: use get_processors in run-make-check script Signed-off-by: John Mulligan (cherry picked from commit 7edc4309f4781362f86fd83fd2d53eba42e5f73f) Conflicts: run-make-check.sh --- run-make-check.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/run-make-check.sh b/run-make-check.sh index 6274303873985..096e3c6c8e1cd 100755 --- a/run-make-check.sh +++ b/run-make-check.sh @@ -37,10 +37,14 @@ function run() { # increase the aio-max-nr, which is by default 65536. we could reach this # limit while running seastar tests and bluestore tests. local m=16 - if [ $(nproc) -gt $m ]; then - m=$(nproc) + local procs="$(($(get_processors) * 2))" + if [ "${procs}" -gt $m ]; then + m="${procs}" + fi + local aiomax="$((65536 * procs))" + if [ "$(/sbin/sysctl -n fs.aio-max-nr )" -lt "${aiomax}" ]; then + $DRY_RUN sudo /sbin/sysctl -q -w fs.aio-max-nr="${aiomax}" fi - $DRY_RUN sudo /sbin/sysctl -q -w fs.aio-max-nr=$((65536 * $(nproc))) CHECK_MAKEOPTS=${CHECK_MAKEOPTS:-$DEFAULT_MAKEOPTS} if in_jenkins; then -- 2.39.5