ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/nvmf: Don't use the stub

Browse Source 
Change-Id: I8581919aee1b95cc367cbfca905e434e5bf5ac4b
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/435936
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Seth Howell 2018-12-03 12:41:07 -07:00 committed by Ben Walker
parent 38462248bf
commit fd985a47dd
4 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/nvmf/common.sh
View File

@ -5,13 +5,8 @@ NVMF_IP_PREFIX="192.168.100"
NVMF_IP_LEAST_ADDR=8 NVMF_IP_LEAST_ADDR=8
NVMF_TCP_IP_ADDRESS="127.0.0.1" NVMF_TCP_IP_ADDRESS="127.0.0.1"
if [ -z "$NVMF_APP" ]; then : ${NVMF_APP_SHM_ID="0"}; export NVMF_APP_SHM_ID
NVMF_APP=./app/nvmf_tgt/nvmf_tgt : ${NVMF_APP="./app/nvmf_tgt/nvmf_tgt -i $NVMF_APP_SHM_ID -e 0xFFFF"}; export NVMF_APP
fi
if [ -z "$NVMF_TEST_CORE_MASK" ]; then
NVMF_TEST_CORE_MASK=0xFF
fi
function load_ib_rdma_modules() function load_ib_rdma_modules()
{ {

4
test/nvmf/host/perf.sh
View File

@ -24,7 +24,7 @@ fi
timing_enter perf timing_enter perf
timing_enter start_nvmf_tgt timing_enter start_nvmf_tgt
$NVMF_APP -m 0xF -i 0 & $NVMF_APP -m 0xF &
nvmfpid=$! nvmfpid=$!
trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
@ -53,7 +53,7 @@ function test_perf()
# Test multi-process access to local NVMe device # Test multi-process access to local NVMe device
if [ -n "$local_nvme_trid" ]; then if [ -n "$local_nvme_trid" ]; then
$rootdir/examples/nvme/perf/perf -i 0 -q 32 -o 4096 -w randrw -M 50 -t 1 -r "$local_nvme_trid" $rootdir/examples/nvme/perf/perf -i $NVMF_APP_SHM_ID -q 32 -o 4096 -w randrw -M 50 -t 1 -r "$local_nvme_trid"
fi fi
$rootdir/examples/nvme/perf/perf -q 32 -o 4096 -w randrw -M 50 -t 1 -r "trtype:$TYPE adrfam:IPv4 traddr:$NVMF_TARGET_IP trsvcid:4420" $rootdir/examples/nvme/perf/perf -q 32 -o 4096 -w randrw -M 50 -t 1 -r "trtype:$TYPE adrfam:IPv4 traddr:$NVMF_TARGET_IP trsvcid:4420"

14
test/nvmf/nvmf.sh
View File

@ -11,18 +11,7 @@ source $rootdir/test/nvmf/common.sh
timing_enter nvmf_tgt timing_enter nvmf_tgt
# NVMF_TEST_CORE_MASK is the biggest core mask specified by trap "exit 1" SIGINT SIGTERM EXIT
# any of the nvmf_tgt tests. Using this mask for the stub
# ensures that if this mask spans CPU sockets, that we will
# allocate memory from both sockets. The stub will *not*
# run anything on the extra cores (and will sleep on master
# core 0) so there is no impact to the nvmf_tgt tests by
# specifying the bigger core mask.
start_stub "-s 2048 -i 0 -m $NVMF_TEST_CORE_MASK"
trap "kill_stub; exit 1" SIGINT SIGTERM EXIT
export NVMF_APP_SHM_ID="0"
export NVMF_APP="./app/nvmf_tgt/nvmf_tgt -i $NVMF_APP_SHM_ID -e 0xFFFF"
run_test suite test/nvmf/filesystem/filesystem.sh run_test suite test/nvmf/filesystem/filesystem.sh
run_test suite test/nvmf/discovery/discovery.sh run_test suite test/nvmf/discovery/discovery.sh
@ -52,7 +41,6 @@ run_test suite test/nvmf/nmic/nmic.sh
timing_exit host timing_exit host
trap - SIGINT SIGTERM EXIT trap - SIGINT SIGTERM EXIT
kill_stub
# TODO: enable nvme device detachment for multi-process so that # TODO: enable nvme device detachment for multi-process so that
# we can use the stub for this test # we can use the stub for this test

2
test/nvmf/shutdown/shutdown.sh
View File

@ -80,7 +80,7 @@ kill -0 $pid
# Test 2: Kill the target unexpectedly # Test 2: Kill the target unexpectedly
# Run bdevperf # Run bdevperf
$rootdir/test/bdev/bdevperf/bdevperf -r /var/tmp/bdevperf.sock -i 0 -c $testdir/bdevperf.conf -q 64 -o 65536 -w verify -t 10 & $rootdir/test/bdev/bdevperf/bdevperf -r /var/tmp/bdevperf.sock -c $testdir/bdevperf.conf -q 64 -o 65536 -w verify -t 10 &
perfpid=$! perfpid=$!
waitforlisten $perfpid /var/tmp/bdevperf.sock waitforlisten $perfpid /var/tmp/bdevperf.sock
$rpc_py -s /var/tmp/bdevperf.sock wait_subsystem_init $rpc_py -s /var/tmp/bdevperf.sock wait_subsystem_init