From feff62c7e514b94adfc3e9c6288c37abecd1f653 Mon Sep 17 00:00:00 2001
From: GangCao <gang.cao@intel.com>
Date: Thu, 9 May 2019 14:05:58 -0400
Subject: [PATCH] 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: GangCao <gang.cao@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/453782
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 test/iscsi_tgt/fio/fio.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/test/iscsi_tgt/fio/fio.sh b/test/iscsi_tgt/fio/fio.sh
index e923026fe..4726fc144 100755
--- a/test/iscsi_tgt/fio/fio.sh
+++ b/test/iscsi_tgt/fio/fio.sh
@@ -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=$?