ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "test/nvmf: Use bdevperf in lvol test instead of fio"

Browse Source 
This reverts commit e086dba5af. 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 <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/439190
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Seth Howell 2019-01-04 13:52:08 -07:00 committed by Jim Harris
parent 7b9a33a43d
commit 9a9022af23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/nvmf/lvol/nvmf_lvol.sh
View File

@ -55,11 +55,10 @@ timing_exit start_nvmf_tgt
modprobe -v nvme-rdma modprobe -v nvme-rdma
touch $testdir/bdevperf.conf
echo "[Nvme]" > $testdir/bdevperf.conf
lvol_stores=() lvol_stores=()
lvol_bdevs=() 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 for i in `seq 1 $SUBSYS_NR`; do
if [ $i -eq 1 ]; then if [ $i -eq 1 ]; then
# construct RAID bdev and put its name in $bdev # 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 $rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode$i $bdev
done done
$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode$i -t rdma -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT $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 done
$rootdir/test/bdev/bdevperf/bdevperf -c $testdir/bdevperf.conf -q 64 -o 65536 -w verify -t 10 for i in `seq 1 $SUBSYS_NR`; do
rm -rf $testdir/bdevperf.conf 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 sync
disconnect_nvmf
for i in `seq 1 $SUBSYS_NR`; do for i in `seq 1 $SUBSYS_NR`; do
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode$i $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode$i