selftests: ublk: fix fio arguments in run_io_and_recover()

run_io_and_recover() invokes fio with --size="${size}", but the variable
size doesn't exist. Thus, the argument expands to --size=, which causes
fio to exit immediately with an error without issuing any I/O. Pass the
value for size as the first argument to the function.

Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/tools/testing/selftests/ublk/test_common.sh b/tools/testing/selftests/ublk/test_common.sh
index 8a4dbd09feb0a885ec7539f1a285ed6f437fe3ab..6f1c042de40e797dc30744e31de521ae08f39c2f 100755 (executable)
--- a/tools/testing/selftests/ublk/test_common.sh
+++ b/tools/testing/selftests/ublk/test_common.sh
@@ -333,11 +333,12 @@ run_io_and_kill_daemon()
 
 run_io_and_recover()
 {
-       local action=$1
+       local size=$1
+       local action=$2
        local state
        local dev_id
 
-       shift 1
+       shift 2
        dev_id=$(_add_ublk_dev "$@")
        _check_add_dev "$TID" $?
 

diff --git a/tools/testing/selftests/ublk/test_generic_04.sh b/tools/testing/selftests/ublk/test_generic_04.sh
index 8b533217d4a174776714dc76331dc2d61c92c4af..baf5b156193de565a2625ac959ce608cfc269d9b 100755 (executable)
--- a/tools/testing/selftests/ublk/test_generic_04.sh
+++ b/tools/testing/selftests/ublk/test_generic_04.sh
@@ -8,7 +8,7 @@ ERR_CODE=0
 
 ublk_run_recover_test()
 {
-       run_io_and_recover "kill_daemon" "$@"
+       run_io_and_recover 256M "kill_daemon" "$@"
        ERR_CODE=$?
        if [ ${ERR_CODE} -ne 0 ]; then
                echo "$TID failure: $*"

diff --git a/tools/testing/selftests/ublk/test_generic_05.sh b/tools/testing/selftests/ublk/test_generic_05.sh
index 398e9e2b58e159046deb64b938443a0ba2b3dd4e..7b5083afc02abe8267a6dd32656cc4f6551296f0 100755 (executable)
--- a/tools/testing/selftests/ublk/test_generic_05.sh
+++ b/tools/testing/selftests/ublk/test_generic_05.sh
@@ -8,7 +8,7 @@ ERR_CODE=0
 
 ublk_run_recover_test()
 {
-       run_io_and_recover "kill_daemon" "$@"
+       run_io_and_recover 256M "kill_daemon" "$@"
        ERR_CODE=$?
        if [ ${ERR_CODE} -ne 0 ]; then
                echo "$TID failure: $*"

diff --git a/tools/testing/selftests/ublk/test_generic_11.sh b/tools/testing/selftests/ublk/test_generic_11.sh
index a00357a5ec6b826aecae5e7c2530f304aa04648b..d1f973c8c645905a4d6205ea1ee0e9402cd50e0a 100755 (executable)
--- a/tools/testing/selftests/ublk/test_generic_11.sh
+++ b/tools/testing/selftests/ublk/test_generic_11.sh
@@ -8,7 +8,7 @@ ERR_CODE=0
 
 ublk_run_quiesce_recover()
 {
-       run_io_and_recover "quiesce_dev" "$@"
+       run_io_and_recover 256M "quiesce_dev" "$@"
        ERR_CODE=$?
        if [ ${ERR_CODE} -ne 0 ]; then
                echo "$TID failure: $*"