From 9a9022af23535c83c9f4366ae4498b4968826b2d Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Fri, 4 Jan 2019 13:52:08 -0700 Subject: [PATCH] Revert "test/nvmf: Use bdevperf in lvol test instead of fio" This reverts commit e086dba5afbee4e1306af1b6f5a43dcaa6364280. The NVMe-oF lvol tests give us a unique view of the interaction between the SPDK target and the kernel initiator. Switching to bdevperf may have masked some issues. Change-Id: Iac999997716188cf392e1d7eb96bbe4a64b9d8d7 Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/439190 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- test/nvmf/lvol/nvmf_lvol.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/test/nvmf/lvol/nvmf_lvol.sh b/test/nvmf/lvol/nvmf_lvol.sh index 8c265df0a9..7fe93a6cec 100755 --- a/test/nvmf/lvol/nvmf_lvol.sh +++ b/test/nvmf/lvol/nvmf_lvol.sh @@ -55,11 +55,10 @@ timing_exit start_nvmf_tgt modprobe -v nvme-rdma -touch $testdir/bdevperf.conf -echo "[Nvme]" > $testdir/bdevperf.conf - lvol_stores=() lvol_bdevs=() +# 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 $SUBSYS_NR`; do if [ $i -eq 1 ]; then # construct RAID bdev and put its name in $bdev @@ -89,14 +88,21 @@ for i in `seq 1 $SUBSYS_NR`; do $rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode$i $bdev done $rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode$i -t rdma -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT - - echo " TransportID \"trtype:RDMA adrfam:IPv4 subnqn:nqn.2016-06.io.spdk:cnode$i traddr:$NVMF_FIRST_TARGET_IP trsvcid:$NVMF_PORT\" Nvme$i" >> $testdir/bdevperf.conf done -$rootdir/test/bdev/bdevperf/bdevperf -c $testdir/bdevperf.conf -q 64 -o 65536 -w verify -t 10 -rm -rf $testdir/bdevperf.conf +for i in `seq 1 $SUBSYS_NR`; do + k=$[$i-1] + nvme connect -t rdma -n "nqn.2016-06.io.spdk:cnode${i}" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT" + + for j in `seq 1 $LVOL_BDEVS_NR`; do + waitforblk "nvme${k}n${j}" + done +done + +$testdir/../fio/nvmf_fio.py 262144 64 randwrite 10 verify sync +disconnect_nvmf for i in `seq 1 $SUBSYS_NR`; do $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode$i