From 002d49fe17eca366ac42e71dc4f0b258da60d43f Mon Sep 17 00:00:00 2001 From: Tomasz Kulasek Date: Mon, 15 Jul 2019 19:36:57 +0200 Subject: [PATCH] test/iscsi_tgt: fix fio nightly test fio write test on null bdev always fails. This patch replaces null bdev with malloc bdev to perform write test. Change-Id: I3192da5445c510227f53209cf27d819b58b3b6e0 Signed-off-by: Tomasz Kulasek Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/461905 Reviewed-by: Darek Stojaczyk Reviewed-by: Changpeng Liu Tested-by: SPDK CI Jenkins --- test/iscsi_tgt/fio/fio.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/iscsi_tgt/fio/fio.sh b/test/iscsi_tgt/fio/fio.sh index 4726fc144..24d0b0c13 100755 --- a/test/iscsi_tgt/fio/fio.sh +++ b/test/iscsi_tgt/fio/fio.sh @@ -84,12 +84,12 @@ $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 +bdev=$( $rpc_py construct_malloc_bdev 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 null1:1' $PORTAL_TAG:$INITIATOR_TAG 64 -d +$rpc_py construct_target_node Target3 Target3_alias "raid0:0 ${bdev}:1" $PORTAL_TAG:$INITIATOR_TAG 64 -d sleep 1 iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$ISCSI_PORT @@ -127,8 +127,8 @@ for malloc_bdev in $malloc_bdevs; do $rpc_py delete_malloc_bdev $malloc_bdev done -# Delete null1 blockdev -$rpc_py delete_null_bdev 'null1' +# Delete malloc device +$rpc_py delete_malloc_bdev ${bdev} fio_status=0 wait $fio_pid || fio_status=$?