Commit 79e48eb7 authored by Seth Howell's avatar Seth Howell Committed by Ben Walker
Browse files

test/nvmf: Delete unneeded references to start_subsystem_init 



nvmf_create_transport can be run both before and after the subsystems
have been initialized. Therefore, we don't need the --wait-for-rpc
argument in most cases. This eliminates the need for calling
start_subsystem_init.

Change-Id: I35560fb968159b4796b1022b1de9cca4dfc5feeb
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/429983


Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent e66ea624

test/nvmf/create_transport/create_transport.sh

+1 −2
Original line number Diff line number Diff line
@@ -31,13 +31,12 @@ fi 
timing_enter cr_trprt

timing_enter start_nvmf_tgt

# Start up the NVMf target in another process

$NVMF_APP -m 0xF --wait-for-rpc &

$NVMF_APP -m 0xF &

nvmfpid=$!



trap "killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid

$rpc_py start_subsystem_init

# Use nvmf_create_transport call to create transport

$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4

timing_exit start_nvmf_tgt

test/nvmf/discovery/discovery.sh

+1 −2
Original line number Diff line number Diff line
@@ -31,13 +31,12 @@ fi 
timing_enter discovery

timing_enter start_nvmf_tgt

# Start up the NVMf target in another process

$NVMF_APP -m 0xF --wait-for-rpc &

$NVMF_APP -m 0xF &

nvmfpid=$!



trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid

$rpc_py start_subsystem_init

$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4

timing_exit start_nvmf_tgt

test/nvmf/filesystem/filesystem.sh

+1 −2
Original line number Diff line number Diff line
@@ -27,13 +27,12 @@ timing_enter fs_test 


for incapsule in 0 4096; do

	# Start up the NVMf target in another process

	$NVMF_APP -m 0xF --wait-for-rpc &

	$NVMF_APP -m 0xF &

	nvmfpid=$!



	trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT



	waitforlisten $nvmfpid

	$rpc_py start_subsystem_init

	$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 -c $incapsule



	bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"

test/nvmf/fio/fio.sh

+1 −2
Original line number Diff line number Diff line
@@ -26,13 +26,12 @@ fi 
timing_enter fio

timing_enter start_nvmf_tgt

# Start up the NVMf target in another process

$NVMF_APP -m 0xF --wait-for-rpc &

$NVMF_APP -m 0xF &

nvmfpid=$!



trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid

$rpc_py start_subsystem_init

$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4



timing_exit start_nvmf_tgt

test/nvmf/host/aer.sh

+1 −2
Original line number Diff line number Diff line
@@ -19,13 +19,12 @@ fi 
timing_enter aer

timing_enter start_nvmf_tgt



$NVMF_APP -m 0xF --wait-for-rpc &

$NVMF_APP -m 0xF &

nvmfpid=$!



trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid

$rpc_py start_subsystem_init

$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4

timing_exit start_nvmf_tgt