Commit 7e408509 authored by Chen Wang's avatar Chen Wang Committed by Jim Harris
Browse files

test/iscsi: add fio and lvol test cases with raid bdev 



1. Use the Raid-0 bdev which based two malloc bdevs to instead of
   one malloc blockbdev.
2. Create the lvol store with Raid-0 bdev which based two malloc bdevs
   when the number of Malloc bdevs is equal to 1.

Change-Id: I8b584ad09011386b405e4756c04273834b24f029
Signed-off-by: default avatarChen Wang <chenx.wang@intel.com>
Reviewed-on: https://review.gerrithub.io/423043


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 407915eb

test/iscsi_tgt/fio/fio.sh

+9 −3
Original line number Diff line number Diff line
@@ -72,12 +72,15 @@ timing_exit start_iscsi_tgt 


$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT

$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE

# "Malloc0:0" ==> use Malloc0 blockdev for LUN0

# Create a RAID-0 bdev from two malloc bdevs

malloc_bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) "

malloc_bdevs+="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"

$rpc_py construct_raid_bdev -n raid0 -s 64 -r 0 -b "$malloc_bdevs"

# "raid0:0" ==> use raid0 blockdev for LUN0

# "1:2" ==> map PortalGroup1 to InitiatorGroup2

# "64" ==> iSCSI queue depth 64

# "-d" ==> disable CHAP authentication

$rpc_py construct_target_node Target3 Target3_alias 'Malloc0:0' $PORTAL_TAG:$INITIATOR_TAG 64 -d

$rpc_py construct_target_node Target3 Target3_alias 'raid0:0' $PORTAL_TAG:$INITIATOR_TAG 64 -d

sleep 1



iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$ISCSI_PORT
@@ -105,7 +108,10 @@ fio_pid=$! 


sleep 3

set +e

# Delete raid0, Malloc0, Malloc1 blockdevs

$rpc_py destroy_raid_bdev 'raid0'

$rpc_py delete_malloc_bdev 'Malloc0'

$rpc_py delete_malloc_bdev 'Malloc1'



wait $fio_pid

fio_status=$?

test/iscsi_tgt/lvol/iscsi_lvol.sh

+15 −4
Original line number Diff line number Diff line
@@ -10,10 +10,10 @@ timing_enter iscsi_lvol 
MALLOC_BDEV_SIZE=128

MALLOC_BLOCK_SIZE=512

if [ $RUN_NIGHTLY -eq 1 ]; then

	NUM_MALLOC=10

	NUM_LVS=10

	NUM_LVOL=10

else

	NUM_MALLOC=2

	NUM_LVS=2

	NUM_LVOL=2

fi
@@ -37,10 +37,21 @@ timing_exit start_iscsi_tgt 


timing_enter setup

$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT

for i in $(seq 1 $NUM_MALLOC); do

# 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 $NUM_LVS); do

	INITIATOR_TAG=$((i + 2))

	$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

	if [ $i -eq 1 ]; then

		# construct RAID bdev and put its name in $bdev

		malloc_bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) "

		malloc_bdevs+="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"

		$rpc_py construct_raid_bdev -n raid0 -s 64 -r 0 -b "$malloc_bdevs"

		bdev="raid0"

	else

		# construct malloc bdev and put its name in $bdev

		bdev=$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)

	fi

	ls_guid=$($rpc_py construct_lvol_store $bdev lvs_$i -c 1048576)

	LUNs=""

	for j in $(seq 1 $NUM_LVOL); do