test/nvmf: Handle multiple arguments in nvmfappstart()
Change-Id: Ibc75320b2de8885125e0835ead9e208fcace976d Signed-off-by: Michal Berger <michalx.berger@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2092 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
This commit is contained in:
parent
871214e2c1
commit
8cc72fe459
@ -86,7 +86,7 @@ if [ $RUN_NIGHTLY -eq 1 ]; then
|
||||
|
||||
# run perf on nvmf target w/compressed vols
|
||||
export TEST_TRANSPORT=tcp && nvmftestinit
|
||||
nvmfappstart "-m 0x7"
|
||||
nvmfappstart -m 0x7
|
||||
trap "nvmftestfini; error_cleanup; exit 1" SIGINT SIGTERM EXIT
|
||||
|
||||
# Create an NVMe-oF subsystem and add compress bdevs as namespaces
|
||||
|
@ -193,7 +193,7 @@ function nvmftestinit() {
|
||||
|
||||
function nvmfappstart() {
|
||||
timing_enter start_nvmf_tgt
|
||||
"${NVMF_APP[@]}" $1 &
|
||||
"${NVMF_APP[@]}" "$@" &
|
||||
nvmfpid=$!
|
||||
trap 'process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1' SIGINT SIGTERM EXIT
|
||||
waitforlisten $nvmfpid
|
||||
|
@ -8,7 +8,7 @@ source $rootdir/test/nvmf/common.sh
|
||||
rpc_py="$rootdir/scripts/rpc.py"
|
||||
|
||||
nvmftestinit
|
||||
nvmfappstart "-m 0xF"
|
||||
nvmfappstart -m 0xF
|
||||
|
||||
$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
|
||||
|
||||
|
@ -11,7 +11,7 @@ MALLOC_BLOCK_SIZE=512
|
||||
rpc_py="$rootdir/scripts/rpc.py"
|
||||
|
||||
function tgt_init() {
|
||||
nvmfappstart "-m 0xF"
|
||||
nvmfappstart -m 0xF
|
||||
|
||||
$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
|
||||
$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0
|
||||
|
@ -11,7 +11,7 @@ MALLOC_BLOCK_SIZE=512
|
||||
rpc_py="$rootdir/scripts/rpc.py"
|
||||
|
||||
nvmftestinit
|
||||
nvmfappstart "-m 0xF"
|
||||
nvmfappstart -m 0xF
|
||||
|
||||
$rootdir/scripts/gen_nvme.sh --json | $rpc_py load_subsystem_config
|
||||
|
||||
|
@ -13,7 +13,7 @@ MALLOC_BLOCK_SIZE=512
|
||||
rpc_py="$rootdir/scripts/rpc.py"
|
||||
|
||||
function disconnect_init() {
|
||||
nvmfappstart "-m 0xF0"
|
||||
nvmfappstart -m 0xF0
|
||||
|
||||
$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0
|
||||
|
||||
|
@ -11,7 +11,7 @@ MALLOC_BLOCK_SIZE=512
|
||||
rpc_py="$rootdir/scripts/rpc.py"
|
||||
|
||||
nvmftestinit
|
||||
nvmfappstart "-m 0xF --wait-for-rpc"
|
||||
nvmfappstart -m 0xF --wait-for-rpc
|
||||
|
||||
# Minimal number of bdev io pool (5) and cache (1)
|
||||
$rpc_py bdev_set_options -p 5 -c 1
|
||||
|
@ -12,7 +12,7 @@ rpc_py="$rootdir/scripts/rpc.py"
|
||||
|
||||
nvmftestinit
|
||||
# Don't use cores 0 - 2 to avoid overlap with bdevio.
|
||||
nvmfappstart "-m 0x78"
|
||||
nvmfappstart -m 0x78
|
||||
|
||||
$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
|
||||
$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0
|
||||
|
@ -12,7 +12,7 @@ rpc_py="$rootdir/scripts/rpc.py"
|
||||
|
||||
# connect disconnect is geared towards ensuring that we are properly freeing resources after disconnecting qpairs.
|
||||
nvmftestinit
|
||||
nvmfappstart "-m 0xF"
|
||||
nvmfappstart -m 0xF
|
||||
|
||||
$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192 -c 0
|
||||
|
||||
|
@ -16,7 +16,7 @@ if ! hash nvme; then
|
||||
fi
|
||||
|
||||
nvmftestinit
|
||||
nvmfappstart "-m 0xF"
|
||||
nvmfappstart -m 0xF
|
||||
|
||||
# Use nvmf_create_transport call to create transport
|
||||
$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
|
||||
|
@ -16,7 +16,7 @@ if ! hash nvme; then
|
||||
fi
|
||||
|
||||
nvmftestinit
|
||||
nvmfappstart "-m 0xF"
|
||||
nvmfappstart -m 0xF
|
||||
|
||||
$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
|
||||
|
||||
|
@ -44,7 +44,7 @@ function nvmf_filesystem_create() {
|
||||
function nvmf_filesystem_part() {
|
||||
incapsule=$1
|
||||
|
||||
nvmfappstart "-m 0xF"
|
||||
nvmfappstart -m 0xF
|
||||
|
||||
$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192 -c $incapsule
|
||||
$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc1
|
||||
|
@ -11,7 +11,7 @@ MALLOC_BLOCK_SIZE=512
|
||||
rpc_py="$rootdir/scripts/rpc.py"
|
||||
|
||||
nvmftestinit
|
||||
nvmfappstart "-m 0xF"
|
||||
nvmfappstart -m 0xF
|
||||
|
||||
$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
|
||||
|
||||
|
@ -11,7 +11,7 @@ MALLOC_BLOCK_SIZE=512
|
||||
rpc_py="$rootdir/scripts/rpc.py"
|
||||
|
||||
nvmftestinit
|
||||
nvmfappstart "-m 0xF"
|
||||
nvmfappstart -m 0xF
|
||||
|
||||
trap 'process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1' SIGINT SIGTERM EXIT
|
||||
|
||||
|
@ -29,7 +29,7 @@ gen_random_s() {
|
||||
}
|
||||
|
||||
nvmftestinit
|
||||
nvmfappstart "-m 0xF"
|
||||
nvmfappstart -m 0xF
|
||||
|
||||
trap 'process_shm --id $NVMF_APP_SHM_ID; nvmftestfini $1; exit 1' SIGINT SIGTERM EXIT
|
||||
|
||||
|
@ -13,7 +13,7 @@ NVMF_SUBSYS=11
|
||||
rpc_py="$rootdir/scripts/rpc.py"
|
||||
|
||||
nvmftestinit
|
||||
nvmfappstart "-m 0xF"
|
||||
nvmfappstart -m 0xF
|
||||
|
||||
# SoftRoce does not have enough queues available for
|
||||
# multiconnection tests. Detect if we're using software RDMA.
|
||||
|
@ -9,7 +9,7 @@ source $rootdir/test/nvmf/common.sh
|
||||
rpc_py="$rootdir/test/nvmf/target/multitarget_rpc.py"
|
||||
|
||||
nvmftestinit
|
||||
nvmfappstart "-m 0xF"
|
||||
nvmfappstart -m 0xF
|
||||
|
||||
trap 'process_shm --id $NVMF_APP_SHM_ID; nvmftestfini $1; exit 1' SIGINT SIGTERM EXIT
|
||||
|
||||
|
@ -11,7 +11,7 @@ MALLOC_BLOCK_SIZE=512
|
||||
rpc_py="$rootdir/scripts/rpc.py"
|
||||
|
||||
nvmftestinit
|
||||
nvmfappstart "-m 0xF"
|
||||
nvmfappstart -m 0xF
|
||||
|
||||
NVMF_SECOND_TARGET_IP=$(echo "$RDMA_IP_LIST" | sed -n 2p)
|
||||
|
||||
|
@ -18,7 +18,7 @@ MALLOC_BLOCK_SIZE=512
|
||||
rpc_py="$rootdir/scripts/rpc.py"
|
||||
|
||||
nvmftestinit
|
||||
nvmfappstart "-m 0xF"
|
||||
nvmfappstart -m 0xF
|
||||
|
||||
$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
|
||||
|
||||
|
@ -13,7 +13,7 @@ LVOL_BDEV_FINAL_SIZE=30
|
||||
rpc_py="$rootdir/scripts/rpc.py"
|
||||
|
||||
nvmftestinit
|
||||
nvmfappstart "-m 0x7"
|
||||
nvmfappstart -m 0x7
|
||||
|
||||
$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
|
||||
|
||||
|
@ -18,7 +18,7 @@ function jsum() {
|
||||
}
|
||||
|
||||
nvmftestinit
|
||||
nvmfappstart "-m 0xF"
|
||||
nvmfappstart -m 0xF
|
||||
|
||||
stats=$($rpc_py nvmf_get_stats)
|
||||
# Expect 4 poll groups (from CPU mask) and no transports yet
|
||||
|
@ -12,7 +12,7 @@ rpc_py="$rootdir/scripts/rpc.py"
|
||||
|
||||
function starttarget() {
|
||||
# Start the target
|
||||
nvmfappstart "-m 0x1E"
|
||||
nvmfappstart -m 0x1E
|
||||
|
||||
$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
|
||||
|
||||
|
@ -17,7 +17,7 @@ if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
nvmfappstart "-m 0xF"
|
||||
nvmfappstart -m 0xF
|
||||
|
||||
# create the rdma transport with an intentionally small SRQ depth
|
||||
$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192 -s 1024
|
||||
|
@ -23,7 +23,7 @@ cat <<- JSON > "$testdir/conf.json"
|
||||
]}
|
||||
JSON
|
||||
|
||||
nvmfappstart "-m 0x3 -p 0 -s 1024 --json $testdir/conf.json"
|
||||
nvmfappstart -m 0x3 -p 0 -s 1024 --json $testdir/conf.json
|
||||
|
||||
trap 'finish_test; process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1' SIGINT SIGTERM EXIT
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user