Commit feff62c7 authored by GangCao's avatar GangCao Committed by Changpeng Liu
Browse files

test: add the 1MB IO read test with higher 1024 queue depth 



To add another NULL bdev together for the larger IO and
higher queue depth testing.

Change-Id: Iaa4e79006e732b579e6b54ebdb5d9abf5f3472ac
Signed-off-by: default avatarGangCao <gang.cao@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/453782


Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 8a24e711

test/iscsi_tgt/fio/fio.sh

+8 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ iscsitestinit $1 $2 
delete_tmp_files() {

	rm -f $testdir/iscsi2.json

	rm -f ./local-job0-0-verify.state

	rm -f ./local-job1-1-verify.state

}



function running_config() {
@@ -83,22 +84,24 @@ $rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK 
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"

$rpc_py construct_null_bdev null1 1024 512

# "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 'raid0:0' $PORTAL_TAG:$INITIATOR_TAG 64 -d

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

sleep 1



iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$ISCSI_PORT

iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT

waitforiscsidevices 1

waitforiscsidevices 2



trap "iscsicleanup; killprocess $pid; iscsitestfini $1 $2; delete_tmp_files; exit 1" SIGINT SIGTERM EXIT



$fio_py -p iscsi -i 4096 -d 1 -t randrw -r 1 -v

$fio_py -p iscsi -i 131072 -d 32 -t randrw -r 1 -v

$fio_py -p iscsi -i 524288 -d 128 -t randrw -r 1 -v

$fio_py -p iscsi -i 1048576 -d 1024 -t read -r 1 -n 4



if [ $RUN_NIGHTLY -eq 1 ]; then

	$fio_py -p iscsi -i 4096 -d 1 -t write -r 300 -v
@@ -124,6 +127,9 @@ for malloc_bdev in $malloc_bdevs; do 
	$rpc_py delete_malloc_bdev $malloc_bdev

done



# Delete null1 blockdev

$rpc_py delete_null_bdev 'null1'



fio_status=0

wait $fio_pid || fio_status=$?