nvme/{032,040}: Use runtime fio background jobs

The fio jobs are supposed to run long in background during the test.
Instead relying on a job size use explicit runtime for this.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/tests/nvme/032 b/tests/nvme/032
index 017d4a339971342e3f66ad43ed10ac07801838ae..93f53ac22a0bcfb2d96ae37b7c406ed086dba4ac 100755 (executable)
--- a/tests/nvme/032
+++ b/tests/nvme/032
@@ -38,8 +38,8 @@ test_device() {
        sysfs="/sys/bus/pci/devices/${pdev}"
 
        # start fio job
-       _run_fio_rand_io --filename="$TEST_DEV" --size=1g \
-               --group_reporting  &> /dev/null &
+       _run_fio_rand_io --filename="$TEST_DEV" \
+               --group_reporting --time_based --runtime=1d &> /dev/null &
 
        sleep 5
 

diff --git a/tests/nvme/040 b/tests/nvme/040
index 04bd726cd30944e0256cee50b8d9c0842d76119e..10f924082f34c051e4edae7a9eab42d6b77b1cb1 100755 (executable)
--- a/tests/nvme/040
+++ b/tests/nvme/040
@@ -21,6 +21,7 @@ test() {
        local port
        local loop_dev
        local nvmedev
+       local fio_pid
 
        echo "Running ${TEST_NAME}"
 
@@ -37,8 +38,10 @@ test() {
 
        # start fio job
        echo "starting background fio"
-       _run_fio_rand_io --filename="/dev/${nvmedev}n1" --size=1g \
-               --group_reporting --ramp_time=5  &> /dev/null &
+       _run_fio_rand_io --filename="/dev/${nvmedev}n1" \
+               --group_reporting --ramp_time=5 \
+               --time_based --runtime=1d &> /dev/null &
+       fio_pid=$!
        sleep 5
 
        # do reset/remove operation
@@ -48,6 +51,8 @@ test() {
        echo "deleting controller"
        _nvme_delete_ctrl "${nvmedev}"
 
+       { kill "${fio_pid}"; wait; } &> /dev/null
+
        _remove_nvmet_subsystem_from_port "${port}" "${subsys}"
        _remove_nvmet_subsystem "${subsys}"
        _remove_nvmet_port "${port}"