test/virtio: Move all nightly test cases to per-patch

With multiqueue all jobs run in parallel so
test execution time will not be extended

Change-Id: I6187ee0acf6958b137ba74dd34706538197ce966
Signed-off-by: Pawel Niedzwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-on: https://review.gerrithub.io/394389
Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Pawel Niedzwiecki 2018-01-11 19:22:48 +01:00 committed by Daniel Verkamp
parent 835e5bc225
commit d66b1e1c91
3 changed files with 21 additions and 62 deletions

View File

@ -10,27 +10,42 @@ verify_backlog=1024
iodepth=128 iodepth=128
bs=4K bs=4K
runtime=10 runtime=10
size=25% size=13%
[job_randwrite] [job_randwrite]
rw=randwrite rw=randwrite
name=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] [job_unmap_trim_sequential]
offset=25% offset=52%
rw=trim rw=trim
trim_verify_zero=1 trim_verify_zero=1
name=unmap_trim_sequential name=unmap_trim_sequential
[job_unmap_trim_random] [job_unmap_trim_random]
offset=50% offset=65%
rw=randtrim rw=randtrim
trim_verify_zero=1 trim_verify_zero=1
name=unmap_trim_random name=unmap_trim_random
[job_unmap_write] [job_unmap_write]
stonewall stonewall
offset=25% offset=52%
size=50% size=26%
rw=randwrite rw=randwrite
name=unmap_write name=unmap_write

View File

@ -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

View File

@ -8,7 +8,6 @@ ROOT_DIR=$(readlink -f $BASE_DIR/../../..)
PLUGIN_DIR=$ROOT_DIR/examples/bdev/fio_plugin PLUGIN_DIR=$ROOT_DIR/examples/bdev/fio_plugin
RPC_PY="$ROOT_DIR/scripts/rpc.py" RPC_PY="$ROOT_DIR/scripts/rpc.py"
FIO_BIN="/usr/src/fio/fio" FIO_BIN="/usr/src/fio/fio"
BDEV_FIO="$BASE_DIR/bdev.fio"
virtio_bdevs="" virtio_bdevs=""
virtio_nvme_bdevs="" virtio_nvme_bdevs=""
@ -46,10 +45,6 @@ if [[ $EUID -ne 0 ]]; then
exit 1 exit 1
fi 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 trap 'rm -f *.state; error_exit "${FUNCNAME}""${LINENO}"' ERR SIGTERM SIGABRT
function run_spdk_fio() { function run_spdk_fio() {
LD_PRELOAD=$PLUGIN_DIR/fio_plugin $FIO_BIN --ioengine=spdk_bdev\ LD_PRELOAD=$PLUGIN_DIR/fio_plugin $FIO_BIN --ioengine=spdk_bdev\
@ -93,7 +88,7 @@ create_bdev_config
timing_exit create_bdev_config timing_exit create_bdev_config
timing_enter run_spdk_fio 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 timing_exit run_spdk_fio
rm -f *.state rm -f *.state