From 14c0f94c8887693aa167064a8c403cef80319b7b Mon Sep 17 00:00:00 2001 From: Kamil Godzwon Date: Mon, 13 Jun 2022 05:36:46 -0400 Subject: [PATCH] test/fio: supress fio output files verify.state files are not very useful because we fail the tests at any first failure. If there was something wrong with IO verification then autotest.sh would fail. Fio files with metrics output (IOPS, BW, latency, etc) are also not very useful as per-patch tests are not focused on benchmarking. Fixes #2546 Signed-off-by: Kamil Godzwon Change-Id: I33fbe2fb0749d840f08ffe0d606d206268140991 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13019 Community-CI: Broadcom CI Reviewed-by: Karol Latecki Reviewed-by: Jim Harris Reviewed-by: Changpeng Liu Tested-by: SPDK CI Jenkins --- scripts/fio-wrapper | 1 + test/bdev/blockdev.sh | 8 ++++---- test/nvmf/target/nvmf_vhost_fio.job | 1 + test/ocf/integrity/test.fio | 1 + test/vhost/common/fio_jobs/default_initiator.job | 1 + test/vhost/common/fio_jobs/default_integrity.job | 1 + test/vhost/common/fio_jobs/default_integrity_nightly.job | 1 + test/vhost/fio/vhost_fio.job | 1 + test/vhost/hotplug/fio_jobs/default_integrity.job | 1 + test/vhost/initiator/bdev.fio | 1 + test/vhost/integrity/integrity_vm.sh | 3 ++- test/vhost/migration/migration-tc1.job | 1 + test/vhost/migration/migration-tc2.job | 1 + test/vhost/vhost_boot/vhost_boot.sh | 2 +- 14 files changed, 18 insertions(+), 6 deletions(-) diff --git a/scripts/fio-wrapper b/scripts/fio-wrapper index 863ef01c2..346d8c6f2 100755 --- a/scripts/fio-wrapper +++ b/scripts/fio-wrapper @@ -21,6 +21,7 @@ fio_config() { numjobs=$numjobs verify_dump=1 verify_backlog=512 + verify_state_save=0 FIO if ((verify == 1)); then diff --git a/test/bdev/blockdev.sh b/test/bdev/blockdev.sh index 3ef179629..852b82bff 100755 --- a/test/bdev/blockdev.sh +++ b/test/bdev/blockdev.sh @@ -234,10 +234,10 @@ function fio_test_suite() { echo "filename=$b" >> $testdir/bdev.fio done - local fio_params="--ioengine=spdk_bdev --iodepth=8 --bs=4k --runtime=10 $testdir/bdev.fio --spdk_json_conf=$conf_file" + local fio_params="--ioengine=spdk_bdev --iodepth=8 --bs=4k --runtime=10 $testdir/bdev.fio \ + --verify_state_save=0 --spdk_json_conf=$conf_file" - run_test "bdev_fio_rw_verify" fio_bdev $fio_params --spdk_mem=$PRE_RESERVED_MEM \ - --output=$output_dir/blockdev_fio_verify.txt --aux-path=$output_dir + run_test "bdev_fio_rw_verify" fio_bdev $fio_params --spdk_mem=$PRE_RESERVED_MEM --aux-path=$output_dir rm -f ./*.state rm -f $testdir/bdev.fio @@ -255,7 +255,7 @@ function fio_test_suite() { return 0 fi - run_test "bdev_fio_trim" fio_bdev $fio_params --output=$output_dir/blockdev_trim.txt --aux-path=$output_dir + run_test "bdev_fio_trim" fio_bdev $fio_params --verify_state_save=0 --aux-path=$output_dir rm -f ./*.state rm -f $testdir/bdev.fio popd diff --git a/test/nvmf/target/nvmf_vhost_fio.job b/test/nvmf/target/nvmf_vhost_fio.job index 350aa895e..fde8481db 100644 --- a/test/nvmf/target/nvmf_vhost_fio.job +++ b/test/nvmf/target/nvmf_vhost_fio.job @@ -12,6 +12,7 @@ verify=md5 verify_fatal=1 verify_dump=1 verify_backlog=8 +verify_state_save=0 [randwrite] rw=randwrite diff --git a/test/ocf/integrity/test.fio b/test/ocf/integrity/test.fio index e56895c28..e45d1b958 100644 --- a/test/ocf/integrity/test.fio +++ b/test/ocf/integrity/test.fio @@ -10,6 +10,7 @@ verify_backlog=1024 iodepth=128 bs=4K runtime=10 +verify_state_save=0 size=20% diff --git a/test/vhost/common/fio_jobs/default_initiator.job b/test/vhost/common/fio_jobs/default_initiator.job index 32c993bd2..015fb9425 100644 --- a/test/vhost/common/fio_jobs/default_initiator.job +++ b/test/vhost/common/fio_jobs/default_initiator.job @@ -8,4 +8,5 @@ verify=md5 verify_backlog=1024 fsync_on_close=1 iodepth=32 +verify_state_save=0 [job0] diff --git a/test/vhost/common/fio_jobs/default_integrity.job b/test/vhost/common/fio_jobs/default_integrity.job index 06398b506..e81b2a2f6 100644 --- a/test/vhost/common/fio_jobs/default_integrity.job +++ b/test/vhost/common/fio_jobs/default_integrity.job @@ -16,4 +16,5 @@ do_verify=1 verify=md5 verify_backlog=1024 fsync_on_close=1 +verify_state_save=0 [nvme-host] diff --git a/test/vhost/common/fio_jobs/default_integrity_nightly.job b/test/vhost/common/fio_jobs/default_integrity_nightly.job index 097401780..dd17a48e8 100644 --- a/test/vhost/common/fio_jobs/default_integrity_nightly.job +++ b/test/vhost/common/fio_jobs/default_integrity_nightly.job @@ -9,6 +9,7 @@ direct=1 do_verify=1 verify=md5 verify_backlog=1024 +verify_state_save=0 [randwrite] stonewall diff --git a/test/vhost/fio/vhost_fio.job b/test/vhost/fio/vhost_fio.job index 350aa895e..fde8481db 100644 --- a/test/vhost/fio/vhost_fio.job +++ b/test/vhost/fio/vhost_fio.job @@ -12,6 +12,7 @@ verify=md5 verify_fatal=1 verify_dump=1 verify_backlog=8 +verify_state_save=0 [randwrite] rw=randwrite diff --git a/test/vhost/hotplug/fio_jobs/default_integrity.job b/test/vhost/hotplug/fio_jobs/default_integrity.job index 136fe9029..d9f685b1e 100644 --- a/test/vhost/hotplug/fio_jobs/default_integrity.job +++ b/test/vhost/hotplug/fio_jobs/default_integrity.job @@ -14,3 +14,4 @@ verify=md5 verify_backlog=1024 time_based=1 runtime=10 +verify_state_save=0 diff --git a/test/vhost/initiator/bdev.fio b/test/vhost/initiator/bdev.fio index 405202282..94e161b83 100644 --- a/test/vhost/initiator/bdev.fio +++ b/test/vhost/initiator/bdev.fio @@ -11,6 +11,7 @@ iodepth=128 bs=4K runtime=10 size=13% +verify_state_save=0 [job_randwrite] rw=randwrite diff --git a/test/vhost/integrity/integrity_vm.sh b/test/vhost/integrity/integrity_vm.sh index c201f278c..74a9c1581 100755 --- a/test/vhost/integrity/integrity_vm.sh +++ b/test/vhost/integrity/integrity_vm.sh @@ -66,7 +66,8 @@ for fs in $fs; do fio --name="integrity" --bsrange=4k-512k --iodepth=128 --numjobs=1 --direct=1 \ --thread=1 --group_reporting=1 --rw=randrw --rwmixread=70 \ --filename=/mnt/${dev}dir/test_file --verify=md5 --do_verify=1 \ - --verify_backlog=1024 --fsync_on_close=1 --runtime=20 --time_based=1 --size=512m + --verify_backlog=1024 --fsync_on_close=1 --runtime=20 --time_based=1 \ + --size=512m --verify_state_save=0 # Print out space consumed on target device df -h /dev/$dev diff --git a/test/vhost/migration/migration-tc1.job b/test/vhost/migration/migration-tc1.job index 3cd57c90b..7e12b689e 100644 --- a/test/vhost/migration/migration-tc1.job +++ b/test/vhost/migration/migration-tc1.job @@ -13,6 +13,7 @@ verify=md5 verify_fatal=1 verify_dump=1 size=100% +verify_state_save=0 [write] rw=write diff --git a/test/vhost/migration/migration-tc2.job b/test/vhost/migration/migration-tc2.job index de8d764cd..86fdf10d4 100644 --- a/test/vhost/migration/migration-tc2.job +++ b/test/vhost/migration/migration-tc2.job @@ -12,6 +12,7 @@ verify=md5 verify_fatal=1 verify_dump=1 verify_backlog=8 +verify_state_save=0 [randwrite] rw=randwrite diff --git a/test/vhost/vhost_boot/vhost_boot.sh b/test/vhost/vhost_boot/vhost_boot.sh index 60743d670..d7a525ad3 100755 --- a/test/vhost/vhost_boot/vhost_boot.sh +++ b/test/vhost/vhost_boot/vhost_boot.sh @@ -118,7 +118,7 @@ vm_exec $vm_no "mkfs.ext4 -F /dev/sda2; mkdir -p /mnt/sda2test; mount /dev/sda2 vm_exec $vm_no "fio --name=integrity --bsrange=4k-512k --iodepth=128 --numjobs=1 --direct=1 \ --thread=1 --group_reporting=1 --rw=randrw --rwmixread=70 --filename=/mnt/sda2test/test_file \ --verify=md5 --do_verify=1 --verify_backlog=1024 --fsync_on_close=1 --runtime=20 \ - --time_based=1 --size=1024m" + --time_based=1 --size=1024m --verify_state_save=0" vm_exec $vm_no "umount /mnt/sda2test; rm -rf /mnt/sda2test" alignment_offset=$(vm_exec $vm_no "cat /sys/block/sda/sda1/alignment_offset") echo "alignment_offset: $alignment_offset"