lib/ftl: Use fio_plugin for ftl tests
Use fio with fio_plugin instead nbd. Change-Id: Ibd94f9de65296814c4bbe45c67f9b47a717c79ac Signed-off-by: Wojciech Malikowski <wojciech.malikowski@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/958 Reviewed-by: Maciej Szczepaniak <maciej.szczepaniak@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
parent
32f59976df
commit
8175aa1fea
@ -1,5 +1,6 @@
|
|||||||
[drive_prep]
|
[drive_prep]
|
||||||
ioengine=libaio
|
ioengine=spdk_bdev
|
||||||
|
spdk_json_conf=${FTL_JSON_CONF}
|
||||||
filename=${FTL_BDEV_NAME}
|
filename=${FTL_BDEV_NAME}
|
||||||
thread=1
|
thread=1
|
||||||
|
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
[global]
|
[global]
|
||||||
ioengine=libaio
|
ioengine=spdk_bdev
|
||||||
|
spdk_json_conf=${FTL_JSON_CONF}
|
||||||
filename=${FTL_BDEV_NAME}
|
filename=${FTL_BDEV_NAME}
|
||||||
direct=1
|
direct=1
|
||||||
thread=1
|
thread=1
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
[global]
|
[global]
|
||||||
ioengine=libaio
|
ioengine=spdk_bdev
|
||||||
|
spdk_json_conf=${FTL_JSON_CONF}
|
||||||
filename=${FTL_BDEV_NAME}
|
filename=${FTL_BDEV_NAME}
|
||||||
direct=1
|
direct=1
|
||||||
thread=1
|
thread=1
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
[global]
|
[global]
|
||||||
ioengine=libaio
|
ioengine=spdk_bdev
|
||||||
|
spdk_json_conf=${FTL_JSON_CONF}
|
||||||
filename=${FTL_BDEV_NAME}
|
filename=${FTL_BDEV_NAME}
|
||||||
thread=1
|
thread=1
|
||||||
direct=1
|
direct=1
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
[global]
|
[global]
|
||||||
ioengine=libaio
|
ioengine=spdk_bdev
|
||||||
|
spdk_json_conf=${FTL_JSON_CONF}
|
||||||
filename=${FTL_BDEV_NAME}
|
filename=${FTL_BDEV_NAME}
|
||||||
thread=1
|
thread=1
|
||||||
direct=1
|
direct=1
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
[global]
|
[global]
|
||||||
ioengine=libaio
|
ioengine=spdk_bdev
|
||||||
|
spdk_json_conf=${FTL_JSON_CONF}
|
||||||
filename=${FTL_BDEV_NAME}
|
filename=${FTL_BDEV_NAME}
|
||||||
thread=1
|
thread=1
|
||||||
direct=1
|
direct=1
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
[global]
|
[global]
|
||||||
ioengine=libaio
|
ioengine=spdk_bdev
|
||||||
|
spdk_json_conf=${FTL_JSON_CONF}
|
||||||
filename=${FTL_BDEV_NAME}
|
filename=${FTL_BDEV_NAME}
|
||||||
thread=1
|
thread=1
|
||||||
direct=1
|
direct=1
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
[global]
|
[global]
|
||||||
ioengine=libaio
|
ioengine=spdk_bdev
|
||||||
|
spdk_json_conf=${FTL_JSON_CONF}
|
||||||
filename=${FTL_BDEV_NAME}
|
filename=${FTL_BDEV_NAME}
|
||||||
direct=1
|
direct=1
|
||||||
thread=1
|
thread=1
|
||||||
|
@ -14,10 +14,9 @@ ftl_bdev_conf=$testdir/config/ftl.conf
|
|||||||
gen_ftl_nvme_conf > $ftl_bdev_conf
|
gen_ftl_nvme_conf > $ftl_bdev_conf
|
||||||
|
|
||||||
fio_kill() {
|
fio_kill() {
|
||||||
$rpc_py stop_nbd_disk /dev/nbd0
|
|
||||||
rmmod nbd || true
|
|
||||||
killprocess $svcpid
|
killprocess $svcpid
|
||||||
rm -f $ftl_bdev_conf
|
rm -f $ftl_bdev_conf
|
||||||
|
rm -f $FTL_JSON_CONF
|
||||||
}
|
}
|
||||||
|
|
||||||
device=$1
|
device=$1
|
||||||
@ -34,7 +33,8 @@ if [ -z "$tests" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export FTL_BDEV_NAME=/dev/nbd0
|
export FTL_BDEV_NAME=ftl0
|
||||||
|
export FTL_JSON_CONF=$testdir/config/ftl.json
|
||||||
|
|
||||||
trap "fio_kill; exit 1" SIGINT SIGTERM EXIT
|
trap "fio_kill; exit 1" SIGINT SIGTERM EXIT
|
||||||
|
|
||||||
@ -50,9 +50,15 @@ else
|
|||||||
$rpc_py bdev_ftl_create -b ftl0 -d nvme0n1 -u $uuid
|
$rpc_py bdev_ftl_create -b ftl0 -d nvme0n1 -u $uuid
|
||||||
fi
|
fi
|
||||||
|
|
||||||
modprobe nbd
|
waitforbdev ftl0
|
||||||
$rpc_py start_nbd_disk ftl0 /dev/nbd0
|
|
||||||
waitfornbd nbd0
|
(
|
||||||
|
echo '{"subsystems": [';
|
||||||
|
$rpc_py save_subsystem_config -n bdev
|
||||||
|
echo ']}'
|
||||||
|
) > $FTL_JSON_CONF
|
||||||
|
|
||||||
|
killprocess $svcpid
|
||||||
|
|
||||||
for test in ${tests}; do
|
for test in ${tests}; do
|
||||||
timing_enter $test
|
timing_enter $test
|
||||||
|
Loading…
Reference in New Issue
Block a user