ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/vhost/initiator: don't use test/vhost/common.sh

Browse Source 
That common.sh requires e.g. qemu installed, which is
completely unnecessary for this test.

vhost_kill() used to clean up e.g. leftover fio files,
but now instead of deleting them, just tell FIO not to
create them by using --verify_state_save=0 fio param.

Change-Id: I5e63dad5681e715ee5dac131ec9b5c17bfdac2eb
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1550
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
Darek Stojaczyk 2020-03-27 12:51:50 +01:00 committed by Tomasz Zawadzki
parent c6dbe0ab0e
commit 473007425e
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/vhost/initiator/blockdev.sh
View File

@ -3,20 +3,18 @@
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../../..)
source $rootdir/test/common/autotest_common.sh source $rootdir/test/common/autotest_common.sh
source $rootdir/test/vhost/common.sh
vhosttestinit RPC_PY="$rootdir/scripts/rpc.py"
source $testdir/autotest.config
RPC_PY="$rootdir/scripts/rpc.py -s $(get_vhost_dir 0)/rpc.sock"
function run_spdk_fio() { function run_spdk_fio() {
fio_bdev --ioengine=spdk_bdev "$@" --spdk_mem=1024 --spdk_single_seg=1 fio_bdev --ioengine=spdk_bdev "$@" --spdk_mem=1024 --spdk_single_seg=1 \
--verify_state_save=0
} }
function create_bdev_config() { function create_bdev_config() {
$rootdir/scripts/gen_nvme.sh --json | $RPC_PY load_subsystem_config
if [ -z "$($RPC_PY bdev_get_bdevs | jq '.[] | select(.name=="Nvme0n1")')" ]; then if [ -z "$($RPC_PY bdev_get_bdevs | jq '.[] | select(.name=="Nvme0n1")')" ]; then
error "Nvme0n1 bdev not found!" echo "Nvme0n1 bdev not found!" && false
fi fi
$RPC_PY bdev_split_create Nvme0n1 6 $RPC_PY bdev_split_create Nvme0n1 6
@ -41,18 +39,16 @@ function create_bdev_config() {
function err_cleanup() { function err_cleanup() {
rm -f $testdir/bdev.json rm -f $testdir/bdev.json
vhost_kill 0 killprocess $vhost_pid
if [[ -n "$dummy_spdk_pid" ]] && kill -0 $dummy_spdk_pid &> /dev/null; then if [[ -n "$dummy_spdk_pid" ]] && kill -0 $dummy_spdk_pid &> /dev/null; then
killprocess $dummy_spdk_pid killprocess $dummy_spdk_pid
fi fi
vhosttestfini
} }
timing_enter vhost_run
vhost_run 0
timing_exit vhost_run
trap 'err_cleanup; exit 1' SIGINT SIGTERM EXIT trap 'err_cleanup; exit 1' SIGINT SIGTERM EXIT
$rootdir/app/vhost/vhost &
vhost_pid=$!
waitforlisten $vhost_pid
timing_enter create_bdev_config timing_enter create_bdev_config
create_bdev_config create_bdev_config
@ -90,8 +86,4 @@ $RPC_PY bdev_nvme_detach_controller Nvme0
trap - SIGINT SIGTERM EXIT trap - SIGINT SIGTERM EXIT
rm -f $testdir/bdev.json rm -f $testdir/bdev.json
timing_enter vhost_kill killprocess $vhost_pid
vhost_kill 0
timing_exit vhost_kill
vhosttestfini