d98c37495a
Ensures compliance now that we've deprecated being able to connect to any listener without adding it to the discovery subsystem first. This patch was tested with a temporary change that removes the default discovery listener. It is possible that future test changes could again depend on this deprecated behavior, but at least now all existing tests will explicitly create the discovery listener, making it more likely that new tests will copy the correct behavior. Signed-off-by: Jim Harris <james.r.harris@intel.com> Change-Id: I936d3d124e22a56548ea43c73ca8197c22ec0f66 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11541 Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com> Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
85 lines
2.4 KiB
Bash
Executable File
85 lines
2.4 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
testdir=$(readlink -f $(dirname $0))
|
|
rootdir=$(readlink -f $testdir/../../..)
|
|
source $rootdir/test/common/autotest_common.sh
|
|
source $rootdir/test/nvmf/common.sh
|
|
|
|
PLUGIN_DIR=$rootdir/examples/nvme/fio_plugin
|
|
|
|
MALLOC_BDEV_SIZE=64
|
|
MALLOC_BLOCK_SIZE=512
|
|
|
|
rpc_py="$rootdir/scripts/rpc.py"
|
|
|
|
function disconnect_init() {
|
|
nvmfappstart -m 0xF0
|
|
|
|
$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0
|
|
|
|
$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS
|
|
$rpc_py nvmf_create_subsystem nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001
|
|
|
|
$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 Malloc0
|
|
$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPORT -a $1 -s $NVMF_PORT
|
|
$rpc_py nvmf_subsystem_add_listener discovery -t $TEST_TRANSPORT -a $1 -s $NVMF_PORT
|
|
}
|
|
|
|
# Test to make sure we don't segfault or access null pointers when we try to connect to
|
|
# a discovery controller that doesn't exist yet.
|
|
function nvmf_target_disconnect_tc1() {
|
|
set +e
|
|
$SPDK_EXAMPLE_DIR/reconnect -q 32 -o 4096 -w randrw -M 50 -t 10 -c 0xF \
|
|
-r "trtype:$TEST_TRANSPORT adrfam:IPv4 traddr:$NVMF_FIRST_TARGET_IP trsvcid:$NVMF_PORT"
|
|
# If the program crashes, the high bit of $? will be set so we will get a value in the hundreds.
|
|
# But if the reconnect code detects errors and exits normally it will return 1.
|
|
if [ $? != 1 ]; then
|
|
set -e
|
|
exit 1
|
|
fi
|
|
set -e
|
|
}
|
|
|
|
function nvmf_target_disconnect_tc2() {
|
|
disconnect_init $NVMF_FIRST_TARGET_IP
|
|
|
|
# If perf doesn't shut down, this test will time out.
|
|
$SPDK_EXAMPLE_DIR/reconnect -q 32 -o 4096 -w randrw -M 50 -t 10 -c 0xF \
|
|
-r "trtype:$TEST_TRANSPORT adrfam:IPv4 traddr:$NVMF_FIRST_TARGET_IP trsvcid:$NVMF_PORT" &
|
|
reconnectpid=$!
|
|
|
|
sleep 2
|
|
kill -9 $nvmfpid
|
|
|
|
sleep 2
|
|
disconnect_init $NVMF_FIRST_TARGET_IP
|
|
|
|
wait $reconnectpid
|
|
sync
|
|
}
|
|
|
|
function nvmf_target_disconnect_tc3() {
|
|
$SPDK_EXAMPLE_DIR/reconnect -q 32 -o 4096 -w randrw -M 50 -t 10 -c 0xF \
|
|
-r "trtype:$TEST_TRANSPORT adrfam:IPv4 traddr:$NVMF_FIRST_TARGET_IP trsvcid:$NVMF_PORT alt_traddr:$NVMF_SECOND_TARGET_IP" &
|
|
reconnectpid=$!
|
|
|
|
sleep 2
|
|
kill -9 $nvmfpid
|
|
|
|
sleep 2
|
|
disconnect_init $NVMF_SECOND_TARGET_IP
|
|
|
|
wait $reconnectpid
|
|
sync
|
|
}
|
|
|
|
nvmftestinit
|
|
run_test "nvmf_target_disconnect_tc1" nvmf_target_disconnect_tc1
|
|
run_test "nvmf_target_disconnect_tc2" nvmf_target_disconnect_tc2
|
|
if [ -n "$NVMF_SECOND_TARGET_IP" ]; then
|
|
run_test "nvmf_target_disconnect_tc3" nvmf_target_disconnect_tc3
|
|
fi
|
|
|
|
trap - SIGINT SIGTERM EXIT
|
|
nvmftestfini
|