diff --git a/test/vhost/initiator/bdev.fio b/test/vhost/initiator/bdev.fio index 86940f07a..405202282 100644 --- a/test/vhost/initiator/bdev.fio +++ b/test/vhost/initiator/bdev.fio @@ -10,27 +10,42 @@ verify_backlog=1024 iodepth=128 bs=4K runtime=10 -size=25% +size=13% [job_randwrite] rw=randwrite name=randwrite +[job_randrw] +offset=13% +rw=randrw +name=randrw + +[job_write] +offset=26% +rw=write +name=write + +[job_rw] +offset=39% +rw=rw +name=rw + [job_unmap_trim_sequential] -offset=25% +offset=52% rw=trim trim_verify_zero=1 name=unmap_trim_sequential [job_unmap_trim_random] -offset=50% +offset=65% rw=randtrim trim_verify_zero=1 name=unmap_trim_random [job_unmap_write] stonewall -offset=25% -size=50% +offset=52% +size=26% rw=randwrite name=unmap_write diff --git a/test/vhost/initiator/bdev_nightly.fio b/test/vhost/initiator/bdev_nightly.fio deleted file mode 100644 index 6d2fcc355..000000000 --- a/test/vhost/initiator/bdev_nightly.fio +++ /dev/null @@ -1,51 +0,0 @@ -[global] -thread=1 -group_reporting=1 -direct=1 -norandommap=1 -time_based=1 -do_verify=1 -verify=md5 -verify_backlog=1024 -iodepth=128 -bs=4K -runtime=10 -size=13% - -[job_randwrite] -rw=randwrite -name=rardwrite - -[job_randrw] -offset=13% -rw=randrw -name=randrw - -[job_write] -offset=26% -rw=write -name=write - -[job_rw] -offset=39% -rw=rw -name=rw - -[job_unmap_trim_sequential] -offset=52% -rw=trim -trim_verify_zero=1 -name=unmap_trim_sequential - -[job_unmap_trim_random] -offset=65% -rw=randtrim -trim_verify_zero=1 -name=unmap_trim_random - -[job_unmap_write] -stonewall -offset=52% -size=26% -rw=randwrite -name=unmap_write diff --git a/test/vhost/initiator/blockdev.sh b/test/vhost/initiator/blockdev.sh index 9a966df97..7f59e3885 100755 --- a/test/vhost/initiator/blockdev.sh +++ b/test/vhost/initiator/blockdev.sh @@ -8,7 +8,6 @@ ROOT_DIR=$(readlink -f $BASE_DIR/../../..) PLUGIN_DIR=$ROOT_DIR/examples/bdev/fio_plugin RPC_PY="$ROOT_DIR/scripts/rpc.py" FIO_BIN="/usr/src/fio/fio" -BDEV_FIO="$BASE_DIR/bdev.fio" virtio_bdevs="" virtio_nvme_bdevs="" @@ -46,10 +45,6 @@ if [[ $EUID -ne 0 ]]; then exit 1 fi -if [ $RUN_NIGHTLY -eq 1 ]; then - BDEV_FIO="$BASE_DIR/bdev_nightly.fio" -fi - trap 'rm -f *.state; error_exit "${FUNCNAME}""${LINENO}"' ERR SIGTERM SIGABRT function run_spdk_fio() { LD_PRELOAD=$PLUGIN_DIR/fio_plugin $FIO_BIN --ioengine=spdk_bdev\ @@ -93,7 +88,7 @@ create_bdev_config timing_exit create_bdev_config timing_enter run_spdk_fio -run_spdk_fio $BDEV_FIO --filename=$virtio_bdevs --spdk_conf=$BASE_DIR/bdev.conf +run_spdk_fio $BASE_DIR/bdev.fio --filename=$virtio_bdevs --spdk_conf=$BASE_DIR/bdev.conf timing_exit run_spdk_fio rm -f *.state