eb387189c2
This was partially fixed in commit 1e481d0438 ("nvmf: Do not allow NN
to change while connections present"), but we did not handle the case
where the user asked to add a NS with a NSID outside the current NN.
This patch reworks the logic (again) to be more straightforward and
hopefully more obviously correct.
Some confusion between max_allowed_nsid and max_nsid is also clarified;
if max_allowed_nsid is set, then max_nsid == max_allowed_nsid at all
times, so we don't need the extra logic when calculating NN in
spdk_nvmf_ctrlr_identify_ctrlr().
Change-Id: If531baf1114e03441ff3e1e1be098071702d9056
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/414894
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
75 lines
1.9 KiB
Bash
Executable File
75 lines
1.9 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="python $rootdir/scripts/rpc.py"
|
|
|
|
set -e
|
|
|
|
RDMA_IP_LIST=$(get_available_rdma_ips)
|
|
NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
|
|
if [ -z $NVMF_FIRST_TARGET_IP ]; then
|
|
echo "no NIC for nvmf test"
|
|
exit 0
|
|
fi
|
|
|
|
timing_enter aer
|
|
timing_enter start_nvmf_tgt
|
|
|
|
$NVMF_APP -s 512 -c $testdir/../nvmf.conf &
|
|
nvmfpid=$!
|
|
|
|
trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
|
|
|
|
waitforlisten $nvmfpid
|
|
timing_exit start_nvmf_tgt
|
|
|
|
modprobe -v nvme-rdma
|
|
|
|
$rpc_py construct_malloc_bdev 64 512 --name Malloc0
|
|
$rpc_py construct_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 "trtype:RDMA traddr:$NVMF_FIRST_TARGET_IP trsvcid:$NVMF_PORT" '' -a -s SPDK00000000000001 -n Malloc0 -m 2
|
|
$rpc_py get_nvmf_subsystems
|
|
|
|
# TODO: this aer test tries to invoke an AER completion by setting the temperature
|
|
#threshold to a very low value. This does not work with emulated controllers
|
|
#though so currently the test is disabled.
|
|
|
|
#$rootdir/test/nvme/aer/aer -r "\
|
|
# trtype:RDMA \
|
|
# adrfam:IPv4 \
|
|
# traddr:$NVMF_FIRST_TARGET_IP \
|
|
# trsvcid:$NVMF_PORT \
|
|
# subnqn:nqn.2014-08.org.nvmexpress.discovery"
|
|
|
|
# Namespace Attribute Notice Tests
|
|
$rootdir/test/nvme/aer/aer -r "\
|
|
trtype:RDMA \
|
|
adrfam:IPv4 \
|
|
traddr:$NVMF_FIRST_TARGET_IP \
|
|
trsvcid:$NVMF_PORT \
|
|
subnqn:nqn.2016-06.io.spdk:cnode1" -n 2 &
|
|
aerpid=$!
|
|
|
|
# Waiting for aer start to work
|
|
sleep 5
|
|
|
|
# Add a new namespace
|
|
$rpc_py construct_malloc_bdev 64 4096 --name Malloc1
|
|
$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 Malloc1 -n 2
|
|
$rpc_py get_nvmf_subsystems
|
|
|
|
wait $aerpid
|
|
|
|
$rpc_py delete_bdev Malloc0
|
|
$rpc_py delete_bdev Malloc1
|
|
$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
|
|
|
|
trap - SIGINT SIGTERM EXIT
|
|
|
|
nvmfcleanup
|
|
killprocess $nvmfpid
|
|
timing_exit aer
|