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

test/nvmf: fix the error message in nvmf_lvol test

Browse Source 
The error message in the chandler pool is:
bdev.c:1127:_spdk_bdev_finish_unregister_bdevs_iter: *ERROR*: Unregistering claimed bdev 'Malloc2'!
bdev.c:1127:_spdk_bdev_finish_unregister_bdevs_iter: *ERROR*: Unregistering claimed bdev 'raid0'!

And this patch can fix this.

Change-Id: I8a247344aa09b62a7395a5513631e7bef6cf0d32
Signed-off-by: Ziye Yang <ziye.yang@intel.com>
Reviewed-on: https://review.gerrithub.io/c/441319
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Ziye Yang 2019-01-21 22:30:06 +08:00 committed by Changpeng Liu
parent d171896a40
commit 0652c0a6c4
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/nvmf/lvol/nvmf_lvol.sh
View File

@ -55,8 +55,8 @@ timing_exit start_nvmf_tgt
modprobe -v nvme-rdma modprobe -v nvme-rdma
lvol_stores=() lvol_stores=
lvol_bdevs=() lvol_bdevs=
# Create the first LVS from a Raid-0 bdev, which is created from two malloc bdevs # Create the first LVS from a Raid-0 bdev, which is created from two malloc bdevs
# Create remaining LVSs from a malloc bdev, respectively # Create remaining LVSs from a malloc bdev, respectively
for i in `seq 1 $SUBSYS_NR`; do for i in `seq 1 $SUBSYS_NR`; do
@ -71,7 +71,7 @@ for i in `seq 1 $SUBSYS_NR`; do
bdev="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)" bdev="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"
fi fi
ls_guid="$($rpc_py construct_lvol_store $bdev lvs_$i -c 524288)" ls_guid="$($rpc_py construct_lvol_store $bdev lvs_$i -c 524288)"
lvol_stores+=("$ls_guid") lvol_stores+="lvs_$i "
# 1 NVMe-OF subsystem per malloc bdev / lvol store / 10 lvol bdevs # 1 NVMe-OF subsystem per malloc bdev / lvol store / 10 lvol bdevs
ns_bdevs="" ns_bdevs=""
@ -79,7 +79,7 @@ for i in `seq 1 $SUBSYS_NR`; do
# Create lvol bdevs on each lvol store # Create lvol bdevs on each lvol store
for j in `seq 1 $LVOL_BDEVS_NR`; do for j in `seq 1 $LVOL_BDEVS_NR`; do
lb_name="$($rpc_py construct_lvol_bdev -u $ls_guid lbd_$j $LVOL_BDEV_SIZE)" lb_name="$($rpc_py construct_lvol_bdev -u $ls_guid lbd_$j $LVOL_BDEV_SIZE)"
lvol_bdevs+=("$lb_name") lvol_bdevs+="$lb_name "
ns_bdevs+="$lb_name " ns_bdevs+="$lb_name "
done done
@ -108,6 +108,14 @@ for i in `seq 1 $SUBSYS_NR`; do
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode$i $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode$i
done done
for lb_name in $lvol_bdevs; do
$rpc_py destroy_lvol_bdev "$lb_name"
done
for lvs in $lvol_stores; do
$rpc_py destroy_lvol_store -l $lvs
done
rm -f ./local-job* rm -f ./local-job*
trap - SIGINT SIGTERM EXIT trap - SIGINT SIGTERM EXIT