tests: use nproc to get number of CPUs for fio jobs

Use nproc to get number of CPUs for fio jobs and introduce
_run_fio_rand_io helper for parallel IO which we don't really care about
the details and just want some IO.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>

diff --git a/common/fio b/common/fio
index 86ed4b2b71808f126dedf33dd76e3b675e184855..f5787b4a9da096ff5db1c7d28f5f85dbe965cab2 100644 (file)
--- a/common/fio
+++ b/common/fio
@@ -166,6 +166,13 @@ _run_fio() {
        fio "${args[@]}" "$@"
 }
 
+# Wrapper around _run_fio used if you need some I/O but don't really care much
+# about the details
+_run_fio_rand_io() {
+       _run_fio --bs=4k --rw=randread --norandommap --numjobs="$(nproc)" \
+               --name=reads --direct=1 "$@"
+}
+
 _fio_perf_report() {
        # If there is more than one group, we don't know what to report.
        if [[ $(wc -l < "$TMPDIR/fio_perf") -gt 1 ]]; then

diff --git a/tests/block/005 b/tests/block/005
index 8f8b7065404e3c560def906240e87b6fc0b8b0b6..e59a3e35221b08efefd5531ea24ced7061b324e0 100755 (executable)
--- a/tests/block/005
+++ b/tests/block/005
@@ -36,9 +36,7 @@ test_device() {
        fi
 
        # start fio job
-       _run_fio --bs=4k --rw=randread --norandommap \
-               --name=reads --filename="$TEST_DEV" --size="$size" \
-               --numjobs=8 --direct=1 &
+       _run_fio_rand_io --filename="$TEST_DEV" --size="$size" &
 
        # while job is running, switch between schedulers
        while kill -0 $! 2>/dev/null; do

diff --git a/tests/block/006 b/tests/block/006
index 18e31cbf3809eab7cc89dba112844496c6a454d2..67d29712b28b5e10f1aff8873de812e81bd8c671 100755 (executable)
--- a/tests/block/006
+++ b/tests/block/006
@@ -43,7 +43,7 @@ test() {
                --filename=/dev/nullb0 --size=5g --direct=1
 
        # run async test
-       _fio_perf --bs=4k --ioengine=libaio --iodepth=8 --numjobs=4 \
+       _fio_perf --bs=4k --ioengine=libaio --iodepth=8 --numjobs="$(nproc)" \
                --rw=randread --norandommap --name=async \
                --filename=/dev/nullb0 --size=5g --direct=1
 

diff --git a/tests/block/008 b/tests/block/008
index 033fa0d5e7a5bee88ec8674cb240ba53c73c976a..03abf57241bdc6c88deec4a8993c48ed06024fd8 100755 (executable)
--- a/tests/block/008
+++ b/tests/block/008
@@ -36,9 +36,7 @@ test_device() {
        fi
 
        # start fio job
-       _run_fio --bs=4k --rw=randread --norandommap \
-               --name=reads --filename="$TEST_DEV" --size="$size" \
-               --numjobs=8 --direct=1 &
+       _run_fio_rand_io --filename="$TEST_DEV" --size="$size" &
 
        # while job is running, hotplug CPUs randomly
        while kill -0 $! 2>/dev/null; do

diff --git a/tests/block/011 b/tests/block/011
index 65ed3dfa70920b50f7b885d45dd3c7dca4d16ce6..920c58bb8ee40c2f3433d96c0e13b3be8fa308aa 100755 (executable)
--- a/tests/block/011
+++ b/tests/block/011
@@ -40,9 +40,8 @@ test_device() {
        fi
 
        # start fio job
-       _run_fio --bs=4k --rw=randread --norandommap \
-               --name=reads --filename="$TEST_DEV" --size="$size" \
-               --numjobs=8 --direct=1 --ignore_error=EIO,ENXIO,ENODEV &
+       _run_fio_rand_io --filename="$TEST_DEV" --size="$size" \
+                       --ignore_error=EIO,ENXIO,ENODEV &
 
        while kill -0 $! 2>/dev/null; do
                echo 0 > "/sys/bus/pci/devices/${pdev}/enable"