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>
58 lines
2.0 KiB
Bash
Executable File
58 lines
2.0 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
|
|
|
|
rpc_py="$rootdir/scripts/rpc.py"
|
|
|
|
nvmftestinit
|
|
nvmfappstart
|
|
|
|
if [ "$TEST_TRANSPORT" != tcp ]; then
|
|
echo "Unsupported transport: $TEST_TRANSPORT"
|
|
exit 0
|
|
fi
|
|
|
|
# Enable zero-copy and set in-capsule data size to zero to make sure all requests are using
|
|
# zero-copy
|
|
$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -c 0 --zcopy
|
|
|
|
$rpc_py nvmf_create_subsystem nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001 -m 10
|
|
$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPORT \
|
|
-a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT
|
|
$rpc_py nvmf_subsystem_add_listener discovery -t $TEST_TRANSPORT \
|
|
-a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT
|
|
$rpc_py bdev_malloc_create 32 4096 -b malloc0
|
|
$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 malloc0 -n 1
|
|
|
|
# First send IO with verification
|
|
$rootdir/test/bdev/bdevperf/bdevperf --json <(gen_nvmf_target_json) \
|
|
-t 10 -q 128 -w verify -o 8192
|
|
|
|
# Then send IO in the background while pausing/resuming the subsystem
|
|
$rootdir/test/bdev/bdevperf/bdevperf --json <(gen_nvmf_target_json) \
|
|
-t 5 -q 128 -w randrw -M 50 -o 8192 &
|
|
perfpid=$!
|
|
|
|
while kill -0 $perfpid; do
|
|
# Add the same namespace again. It'll fail, but will also pause/resume the subsystem and
|
|
# the namespace forcing the IO requests to be queued/resubmitted.
|
|
$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 malloc0 -n 1 &> /dev/null || :
|
|
done
|
|
|
|
wait $perfpid
|
|
|
|
# Verify that aborting requests serviced through zero-copy works too
|
|
$rpc_py nvmf_subsystem_remove_ns nqn.2016-06.io.spdk:cnode1 1
|
|
$rpc_py bdev_delay_create -b malloc0 -d delay0 -r 1000000 -t 1000000 -w 1000000 -n 1000000
|
|
$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 delay0 -n 1
|
|
|
|
$SPDK_EXAMPLE_DIR/abort -c 0x1 -t 5 -q 64 -w randrw -M 50 -l warning \
|
|
-r "trtype:$TEST_TRANSPORT adrfam:IPv4 traddr:$NVMF_FIRST_TARGET_IP trsvcid:$NVMF_PORT ns:1"
|
|
|
|
trap - SIGINT SIGTERM EXIT
|
|
nvmftestfini
|