Commit c42bee0c authored by Ziye Yang's avatar Ziye Yang Committed by Jim Harris
Browse files

nvmf/host/perf.sh: refactor the code into a common function 



Purpose: prepare to add the TCP transport test.

Change-Id: I5dd2acabb9259b7a85919ab2dca41eacf9dee913
Signed-off-by: default avatarZiye Yang <optimistyzy@gmail.com>
Reviewed-on: https://review.gerrithub.io/433964


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

test/nvmf/host/perf.sh

+54 −47
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ nvmfpid=$! 
trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid

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

$rootdir/scripts/gen_nvme.sh --json | $rpc_py load_subsystem_config

timing_exit start_nvmf_tgt
@@ -39,18 +38,23 @@ if [ -n "$local_nvme_trid" ]; then 
	bdevs="$bdevs Nvme0n1"

fi



function test_perf()

{

	TYPE=$1

	NVMF_TARGET_IP=$2

	$rpc_py nvmf_create_transport -t $TYPE -p 4

	$rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001

	for bdev in $bdevs; do

		$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 $bdev

	done

$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t rdma -a $NVMF_FIRST_TARGET_IP -s 4420

	$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TYPE -a $NVMF_TARGET_IP -s 4420



	# Test multi-process access to local NVMe device

	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"

	fi



$rootdir/examples/nvme/perf/perf -q 32 -o 4096 -w randrw -M 50 -t 1 -r "trtype:RDMA adrfam:IPv4 traddr:$NVMF_FIRST_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"

	sync

	$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
@@ -69,13 +73,13 @@ if [ $RUN_NIGHTLY -eq 1 ]; then 
			for bdev in $lb_nested_guid; do

				$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 $bdev

			done

		$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t rdma -a $NVMF_FIRST_TARGET_IP -s 4420

			$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TYPE -a $NVMF_TARGET_IP -s 4420

			# Test perf as host with different io_size and qd_depth in nightly

			qd_depth=("1" "128")

			io_size=("512" "131072")

			for qd in ${qd_depth[@]}; do

				for o in ${io_size[@]}; do

				$rootdir/examples/nvme/perf/perf -q $qd -o $o -w randrw -M 50 -t 10 -r "trtype:RDMA adrfam:IPv4 traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420"

					$rootdir/examples/nvme/perf/perf -q $qd -o $o -w randrw -M 50 -t 10 -r "trtype:$TYPE adrfam:IPv4 traddr:$NVMF_TARGET_IP trsvcid:4420"

				done

			done
@@ -88,6 +92,9 @@ if [ $RUN_NIGHTLY -eq 1 ]; then 
			$rpc_py delete_nvme_controller Nvme0

		fi

	fi

}



test_perf "RDMA" $NVMF_FIRST_TARGET_IP



trap - SIGINT SIGTERM EXIT