Commit d9ff1b59 authored by Yalong Wang's avatar Yalong Wang Committed by Tomasz Zawadzki
Browse files

bdev/raid: set dep_unblock for raid sub-io 



Fixes #3710

Change-Id: I7e856d2e9cb22b7ab2ab44933027501e66f7de5b
Signed-off-by: default avatarYalong Wang <yalong9@staff.sina.com.cn>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26452


Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarGangCao <gang.cao@intel.com>
Reviewed-by: default avatarArtur Paszkiewicz <artur.paszkiewicz@solidigm.com>
Reviewed-by: default avatarChangpeng Liu <changpeliu@tencent.com>
parent 4d5c4b46

module/bdev/raid/bdev_raid.c

+2 −0
Original line number Diff line number Diff line
@@ -723,6 +723,8 @@ raid_bdev_queue_io_wait(struct raid_bdev_io *raid_io, struct spdk_bdev *bdev, 
	raid_io->waitq_entry.bdev = bdev;

	raid_io->waitq_entry.cb_fn = cb_fn;

	raid_io->waitq_entry.cb_arg = raid_io;

	raid_io->waitq_entry.dep_unblock = true;



	spdk_bdev_queue_io_wait(bdev, ch, &raid_io->waitq_entry);

}

test/bdev/bdev_raid.sh

+63 −0
Original line number Diff line number Diff line
@@ -104,6 +104,67 @@ function raid_unmap_function_test() { 
	return 0

}



function raid_io_resource_dependence() {

	rm -rf $testdir/aio1.bdev

	rm -rf $testdir/aio2.bdev

	truncate -s 2048MB $testdir/aio1.bdev

	truncate -s 2048MB $testdir/aio2.bdev



	local nbd=/dev/nbd0

	local raid_bdev



	$rootdir/test/app/bdev_svc/bdev_svc -i 0 -L bdev_raid &

	raid_pid=$!

	echo "Process raid pid: $raid_pid"

	waitforlisten $raid_pid



	$rpc_py bdev_aio_create $testdir/aio1.bdev Base_1 4096 --fallocate

	$rpc_py bdev_aio_create $testdir/aio2.bdev Base_2 4096 --fallocate



	$rpc_py bdev_raid_create -r raid1 -b "'Base_1 Base_2'" -n raid



	$rpc_py bdev_lvol_create_lvstore raid lvs -c 8192



	for lv_size in 256 768; do

		echo "==== Testing LV size: ${lv_size} ===="



		$rpc_py bdev_lvol_create -l lvs lv0 ${lv_size} -t



		lvol_bdev=$($rpc_py bdev_lvol_get_lvols | jq -r '.[0]["alias"] | select(.)')

		if [ -z "$lvol_bdev" ]; then

			echo "lvol create failed"

			exit 1

		fi



		nbd_start_disks $DEFAULT_RPC_ADDR $lvol_bdev $nbd

		count=$(nbd_get_count $DEFAULT_RPC_ADDR)

		if [ $count -ne 1 ]; then

			exit 1

		fi



		fio --name=test --filename=$nbd --rw=randwrite --bs=8k --iodepth=128 --ioengine=aio --numjobs=1 --direct=1

		sleep 1



		nbd_stop_disks $DEFAULT_RPC_ADDR $nbd

		count=$(nbd_get_count $DEFAULT_RPC_ADDR)

		if [ $count -ne 0 ]; then

			exit 1

		fi



		time $rpc_py bdev_lvol_delete $lvol_bdev



		echo "==== Done LV size: ${lv_size} ===="

		echo

	done



	killprocess $raid_pid



	rm -rf $testdir/aio1.bdev

	rm -rf $testdir/aio2.bdev



	return 0

}



function verify_raid_bdev_state() {

	local raid_bdev_name=$1

	local expected_state=$2
@@ -953,6 +1014,8 @@ trap 'cleanup; exit 1' EXIT 


base_blocklen=512



run_test "raid_io_resource_dependence" raid_io_resource_dependence



run_test "raid1_resize_data_offset_test" raid_resize_data_offset_test



run_test "raid0_resize_superblock_test" raid_resize_superblock_test 0