Commit ca88f46a authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

test/nvmf: connect kernel host in shutdown test 



ATtempt to reproduce GitHub issue #233

Change-Id: I6df334606e6db6c182eccac1f7a3d294dad990a9
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/398251


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent d7541156

test/nvmf/shutdown/shutdown.sh

+21 −3
Original line number Diff line number Diff line
@@ -25,22 +25,40 @@ timing_enter start_nvmf_tgt 
$NVMF_APP -c $testdir/../nvmf.conf &

pid=$!



trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT

trap "killprocess $pid; nvmfcleanup; exit 1" SIGINT SIGTERM EXIT



waitforlisten $pid

timing_exit start_nvmf_tgt



# Create 10 subsystems

for i in `seq 1 10`

num_subsystems=10

# SoftRoce does not have enough queues available for

# this test. Detect if we're using software RDMA.

# If so, only use one subsystem.

if check_ip_is_soft_roce "$NVMF_FIRST_TARGET_IP"; then

	num_subsystems=1

fi



# Create subsystems

for i in `seq 1 $num_subsystems`

do

	bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"

	$rpc_py construct_nvmf_subsystem nqn.2016-06.io.spdk:cnode${i} "trtype:RDMA traddr:$NVMF_FIRST_TARGET_IP trsvcid:$NVMF_PORT" '' -a -s SPDK${i} -n "$bdevs"

done



modprobe -v nvme-rdma

modprobe -v nvme-fabrics



# Connect kernel host to subsystems

for i in `seq 1 $num_subsystems`; do

	nvme connect -t rdma -n "nqn.2016-06.io.spdk:cnode${i}" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"

done



# Kill nvmf tgt without removing any subsystem to check whether it can shutdown correctly

rm -f ./local-job0-0-verify.state



trap - SIGINT SIGTERM EXIT



killprocess $pid



nvmfcleanup

timing_exit shutdown