1551197db5
This parameter describes the number of admin and IO qpairs while admin qpair always exists and should not be configured explicitly. Introduce a new parameter `max_io_qpairs_per_ctrlr` which configures the number of IO qpairs. Internal structure of NVMF transport is not changed, both RPC parameters configure the same nvmf transport parameter. Deprecate max_qpairs_per_ctrlr in spdkcli as well Side change: update dif_insert_or_strip description - it can be used by TCP and RDMA transports Config files parsing is not changed since it is deprecated Fixes #1378 Change-Id: I8403ee6fcf090bb5e86a32e4868fea5924daed23 Signed-off-by: Alexey Marchuk <alexeymar@mellanox.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2279 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Anil Veerabhadrappa <anil.veerabhadrappa@broadcom.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Community-CI: Broadcom CI
86 lines
4.3 KiB
Bash
Executable File
86 lines
4.3 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/spdkcli/common.sh
|
|
source $rootdir/test/nvmf/common.sh
|
|
|
|
MATCH_FILE="spdkcli_nvmf.test"
|
|
SPDKCLI_BRANCH="/nvmf"
|
|
|
|
trap 'on_error_exit; revert_soft_roce' ERR
|
|
rdma_device_init
|
|
|
|
timing_enter run_nvmf_tgt
|
|
run_nvmf_tgt
|
|
timing_exit run_nvmf_tgt
|
|
|
|
RDMA_IP_LIST=$(get_available_rdma_ips)
|
|
NVMF_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
|
|
|
|
timing_enter spdkcli_create_nvmf_config
|
|
$spdkcli_job "'/bdevs/malloc create 32 512 Malloc1' 'Malloc1' True
|
|
'/bdevs/malloc create 32 512 Malloc2' 'Malloc2' True
|
|
'/bdevs/malloc create 32 512 Malloc3' 'Malloc3' True
|
|
'/bdevs/malloc create 32 512 Malloc4' 'Malloc4' True
|
|
'/bdevs/malloc create 32 512 Malloc5' 'Malloc5' True
|
|
'/bdevs/malloc create 32 512 Malloc6' 'Malloc6' True
|
|
'nvmf/transport create RDMA max_io_qpairs_per_ctrlr=4 io_unit_size=8192' '' True
|
|
'/nvmf/subsystem create nqn.2014-08.org.spdk:cnode1 N37SXV509SRW\
|
|
max_namespaces=4 allow_any_host=True' 'nqn.2014-08.org.spdk:cnode1' True
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces create Malloc3 1' 'Malloc3' True
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces create Malloc4 2' 'Malloc4' True
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses create \
|
|
RDMA $NVMF_TARGET_IP 4260 IPv4' '$NVMF_TARGET_IP:4260' True
|
|
'/nvmf/subsystem create nqn.2014-08.org.spdk:cnode2 N37SXV509SRD\
|
|
max_namespaces=2 allow_any_host=True' 'nqn.2014-08.org.spdk:cnode2' True
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode2/namespaces create Malloc2' 'Malloc2' True
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode2/listen_addresses create \
|
|
RDMA $NVMF_TARGET_IP 4260 IPv4' '$NVMF_TARGET_IP:4260' True
|
|
'/nvmf/subsystem create nqn.2014-08.org.spdk:cnode3 N37SXV509SRR\
|
|
max_namespaces=2 allow_any_host=True' 'nqn.2014-08.org.spdk:cnode2' True
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/namespaces create Malloc1' 'Malloc1' True
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/listen_addresses create \
|
|
RDMA $NVMF_TARGET_IP 4260 IPv4' '$NVMF_TARGET_IP:4260' True
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/listen_addresses create \
|
|
RDMA $NVMF_TARGET_IP 4261 IPv4' '$NVMF_TARGET_IP:4261' True
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/hosts create \
|
|
nqn.2014-08.org.spdk:cnode1' 'nqn.2014-08.org.spdk:cnode1' True
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/hosts create \
|
|
nqn.2014-08.org.spdk:cnode2' 'nqn.2014-08.org.spdk:cnode2' True
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1 allow_any_host True' 'Allow any host'
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1 allow_any_host False' 'Allow any host' True
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses create RDMA $NVMF_TARGET_IP 4261 IPv4' '$NVMF_TARGET_IP:4261' True
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses create RDMA $NVMF_TARGET_IP 4262 IPv4' '$NVMF_TARGET_IP:4262' True
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/hosts create nqn.2014-08.org.spdk:cnode2' 'nqn.2014-08.org.spdk:cnode2' True
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces create Malloc5' 'Malloc5' True
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces create Malloc6' 'Malloc6' True
|
|
"
|
|
timing_exit spdkcli_create_nvmf_config
|
|
|
|
timing_enter spdkcli_check_match
|
|
check_match
|
|
timing_exit spdkcli_check_match
|
|
|
|
timing_enter spdkcli_clear_nvmf_config
|
|
$spdkcli_job "'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces delete nsid=1' 'Malloc3'
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces delete_all' 'Malloc4'
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/hosts delete nqn.2014-08.org.spdk:cnode2' 'nqn.2014-08.org.spdk:cnode2'
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/hosts delete_all' 'nqn.2014-08.org.spdk:cnode1'
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses delete RDMA $NVMF_TARGET_IP 4262' '$NVMF_TARGET_IP:4262'
|
|
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses delete_all' '$NVMF_TARGET_IP:4261'
|
|
'/nvmf/subsystem delete nqn.2014-08.org.spdk:cnode3' 'nqn.2014-08.org.spdk:cnode3'
|
|
'/nvmf/subsystem delete_all' 'nqn.2014-08.org.spdk:cnode2'
|
|
'/bdevs/malloc delete Malloc6' 'Malloc6'
|
|
'/bdevs/malloc delete Malloc5' 'Malloc5'
|
|
'/bdevs/malloc delete Malloc4' 'Malloc4'
|
|
'/bdevs/malloc delete Malloc3' 'Malloc3'
|
|
'/bdevs/malloc delete Malloc2' 'Malloc2'
|
|
'/bdevs/malloc delete Malloc1' 'Malloc1'
|
|
"
|
|
timing_exit spdkcli_clear_nvmf_config
|
|
|
|
killprocess $nvmf_tgt_pid
|
|
#revert_soft_roce
|