diff --git a/test/nvmf/lvol/nvmf_lvol.sh b/test/nvmf/lvol/nvmf_lvol.sh index 7fe93a6ce..a2501f1ae 100755 --- a/test/nvmf/lvol/nvmf_lvol.sh +++ b/test/nvmf/lvol/nvmf_lvol.sh @@ -55,8 +55,8 @@ timing_exit start_nvmf_tgt modprobe -v nvme-rdma -lvol_stores=() -lvol_bdevs=() +lvol_stores= +lvol_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 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)" fi 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 ns_bdevs="" @@ -79,7 +79,7 @@ for i in `seq 1 $SUBSYS_NR`; do # Create lvol bdevs on each lvol store for j in `seq 1 $LVOL_BDEVS_NR`; do 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 " 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 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* trap - SIGINT SIGTERM EXIT