d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test/vhost: remove hardcoded JSON config for shared test

Browse Source 
Using JSON config with hardcoded path makes this test
susceptible to fail if some directory changes are made
during test. Remove the file and generate fresh config
on each test run.

Change-Id: Id8be920daad71207c06a867a8b6cb4403f1962a8
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8826
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Michal Berger <michalx.berger@intel.com>
This commit is contained in:
Karol Latecki 2021-07-19 15:20:02 +02:00 committed by Tomasz Zawadzki
parent 4ce1735929
commit 5354fc45b0
2 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/vhost/shared/bdev.json
View File

@ -1,23 +0,0 @@
{
"subsystems": [
{
"subsystem": "bdev",
"config": [
{
"method": "bdev_virtio_attach_controller",
"params": {
"vq_count": 2,
"traddr": "Malloc.0",
"dev_type": "blk",
"vq_size": 512,
"name": "VirtioBlk0",
"trtype": "user"
}
},
{
"method": "bdev_wait_for_examine"
}
]
}
]
}

33
test/vhost/shared/shared.sh
View File

@ -6,18 +6,47 @@ source $rootdir/test/common/autotest_common.sh
source $rootdir/test/vhost/common.sh
rpc_py="$rootdir/scripts/rpc.py -s $(get_vhost_dir 0)/rpc.sock"
vhost_name="0"
bdev_conf=$(
cat <<- JSON
{
"subsystems": [
{
"subsystem": "bdev",
"config": [
{
"method": "bdev_virtio_attach_controller",
"params": {
"vq_count": 2,
"traddr": "$(get_vhost_dir $vhost_name)/Malloc.0",
"dev_type": "blk",
"vq_size": 512,
"name": "VirtioBlk0",
"trtype": "user"
}
},
{
"method": "bdev_wait_for_examine"
}
]
}
]
}
JSON
)
function run_spdk_fio() {
fio_bdev --ioengine=spdk_bdev \
"$rootdir/test/vhost/common/fio_jobs/default_initiator.job" --runtime=10 --rw=randrw \
--spdk_mem=1024 --spdk_single_seg=1 --spdk_json_conf=$testdir/bdev.json "$@"
--spdk_mem=1024 --spdk_single_seg=1 --spdk_json_conf=<(echo "$bdev_conf") "$@"
}
vhosttestinit "--no_vm"
trap 'error_exit "${FUNCNAME}" "${LINENO}"' ERR SIGTERM SIGABRT
vhost_run -n 0
vhost_run -n "$vhost_name"
$rpc_py bdev_malloc_create -b Malloc 124 4096
$rpc_py vhost_create_blk_controller Malloc.0 Malloc