Commit 87a2b42b authored by Michal Berger's avatar Michal Berger Committed by Konrad Sztyber
Browse files

test/bdev: Simplify nbd_lvol_verify() 



This function uses only single nbd so there's no point in passing
the entire list. Also, the es from mkfs doesn't have to be handled
since if it fails errexit will catch it way sooner.

Change-Id: Iee7b66f1bd8b83d5cc03171f7768b34f0da41ba6
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/24786


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 80b71d70

test/bdev/blockdev.sh

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ function nbd_function_test() { 


	nbd_rpc_start_stop_verify $rpc_server "${bdev_list[*]}"

	nbd_rpc_data_verify $rpc_server "${bdev_list[*]}" "${nbd_list[*]}"

	nbd_with_lvol_verify $rpc_server "${nbd_list[*]}"

	nbd_with_lvol_verify $rpc_server "${nbd_list[0]}"



	killprocess $nbd_pid

	trap - SIGINT SIGTERM EXIT

test/bdev/nbd_common.sh

+4 −11
Original line number Diff line number Diff line
@@ -129,20 +129,13 @@ function nbd_rpc_start_stop_verify() { 


function nbd_with_lvol_verify() {

	local rpc_server=$1

	local nbd_list=($2)

	local mkfs_ret

	local nbd=$2



	$rootdir/scripts/rpc.py -s $rpc_server bdev_malloc_create -b malloc_lvol_verify 16 512

	$rootdir/scripts/rpc.py -s $rpc_server bdev_lvol_create_lvstore malloc_lvol_verify lvs

	$rootdir/scripts/rpc.py -s $rpc_server bdev_lvol_create lvol 4 -l lvs

	$rootdir/scripts/rpc.py -s $rpc_server nbd_start_disk lvs/lvol "${nbd_list[0]}"

	$rootdir/scripts/rpc.py -s $rpc_server nbd_start_disk lvs/lvol "$nbd"



	mkfs.ext4 ${nbd_list[0]}

	mkfs_ret=$?

	nbd_stop_disks $rpc_server "${nbd_list[0]}"

	if [ $mkfs_ret -ne 0 ]; then

		return 1

	fi



	return 0

	mkfs.ext4 "$nbd"

	nbd_stop_disks $rpc_server "$nbd"

}