From 23b51246176d46a2bcdfe8371094e6adf0d613e4 Mon Sep 17 00:00:00 2001 From: Hailiang Wang Date: Wed, 31 Jul 2019 15:12:53 +0800 Subject: [PATCH] test/construct_raid_bdev: fix a deprecated param -s The "-s" causes ERROR printing, because it has been deprecated. So I modify it to equally functional "-z". Change-Id: I9c34bd98fef2c2bd346d288b6a20338be02382f5 Signed-off-by: Hailiang Wang Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/463737 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Darek Stojaczyk --- test/iscsi_tgt/fio/fio.sh | 2 +- test/iscsi_tgt/lvol/iscsi_lvol.sh | 2 +- test/nvmf/target/fio.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/iscsi_tgt/fio/fio.sh b/test/iscsi_tgt/fio/fio.sh index 24d0b0c13..23ccb3ffc 100755 --- a/test/iscsi_tgt/fio/fio.sh +++ b/test/iscsi_tgt/fio/fio.sh @@ -83,7 +83,7 @@ $rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK # 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" +$rpc_py construct_raid_bdev -n raid0 -z 64 -r 0 -b "$malloc_bdevs" bdev=$( $rpc_py construct_malloc_bdev 1024 512 ) # "raid0:0" ==> use raid0 blockdev for LUN0 # "1:2" ==> map PortalGroup1 to InitiatorGroup2 diff --git a/test/iscsi_tgt/lvol/iscsi_lvol.sh b/test/iscsi_tgt/lvol/iscsi_lvol.sh index d9b89eed7..4e7bdd7fa 100755 --- a/test/iscsi_tgt/lvol/iscsi_lvol.sh +++ b/test/iscsi_tgt/lvol/iscsi_lvol.sh @@ -50,7 +50,7 @@ for i in $(seq 1 $NUM_LVS); do # 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" + $rpc_py construct_raid_bdev -n raid0 -z 64 -r 0 -b "$malloc_bdevs" bdev="raid0" else # construct malloc bdev and put its name in $bdev diff --git a/test/nvmf/target/fio.sh b/test/nvmf/target/fio.sh index c70a3754e..d35f20a65 100755 --- a/test/nvmf/target/fio.sh +++ b/test/nvmf/target/fio.sh @@ -21,7 +21,7 @@ malloc_bdevs+="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_S # Create a RAID-0 bdev from two malloc bdevs raid_malloc_bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) " raid_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 "$raid_malloc_bdevs" +$rpc_py construct_raid_bdev -n raid0 -z 64 -r 0 -b "$raid_malloc_bdevs" $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001 for malloc_bdev in $malloc_bdevs; do