Commit d6379a88 authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

test/bdev: convert qos tests to run_test semantics. 



Change-Id: I5b52cc57c09bebcb80921821f293ab464c9f915a
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/477490


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 8295a2b0

test/bdev/blockdev.sh

+26 −27
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ function qos_function_test() { 


		# Run bdevperf with IOPS rate limit on bdev 1

		$rpc_py bdev_set_qos_limit --rw_ios_per_sec $iops_limit $QOS_DEV_1

		run_qos_test $iops_limit IOPS $QOS_DEV_1

		run_test "case" "bdev_qos_iops" run_qos_test $iops_limit IOPS $QOS_DEV_1



		# Run bdevperf with bandwidth rate limit on bdev 2

		# Set the bandwidth limit as 1/10 of the measure performance without QoS
@@ -140,16 +140,38 @@ function qos_function_test() { 
			bw_limit=$qos_lower_bw_limit

		fi

		$rpc_py bdev_set_qos_limit --rw_mbytes_per_sec $bw_limit $QOS_DEV_2

		run_qos_test $bw_limit BANDWIDTH $QOS_DEV_2

		run_test "case" "bdev_qos_bw" run_qos_test $bw_limit BANDWIDTH $QOS_DEV_2



		# Run bdevperf with additional read only bandwidth rate limit on bdev 1

		$rpc_py bdev_set_qos_limit --r_mbytes_per_sec $qos_lower_bw_limit $QOS_DEV_1

		run_qos_test $qos_lower_bw_limit BANDWIDTH $QOS_DEV_1

		run_test "case" "bdev_qos_ro_bw" run_qos_test $qos_lower_bw_limit BANDWIDTH $QOS_DEV_1

	else

		echo "Actual IOPS without limiting is too low - exit testing"

	fi

}



function qos_test_suite() {

	# Run bdevperf with QoS disabled first

	$testdir/bdevperf/bdevperf -z -m 0x2 -q 256 -o 4096 -w randread -t 60 &

	QOS_PID=$!

	echo "Process qos testing pid: $QOS_PID"

	trap 'killprocess $QOS_PID; exit 1' SIGINT SIGTERM EXIT

	waitforlisten $QOS_PID



	$rpc_py bdev_null_create $QOS_DEV_1 128 512

	waitforbdev $QOS_DEV_1

	$rpc_py bdev_null_create $QOS_DEV_2 128 512

	waitforbdev $QOS_DEV_2



	$rootdir/test/bdev/bdevperf/bdevperf.py perform_tests &

	qos_function_test



	$rpc_py bdev_null_delete $QOS_DEV_1

	$rpc_py bdev_null_delete $QOS_DEV_2

	killprocess $QOS_PID

	trap - SIGINT SIGTERM EXIT

}



# Inital bdev creation and configuration

#-----------------------------------------------------

QOS_DEV_1="Null_0"
@@ -259,6 +281,7 @@ fi 
# Run bdevperf with gpt

run_test "case" "bdev_gpt_verify" $testdir/bdevperf/bdevperf -c $testdir/bdev_gpt.conf -q 128 -o 4096 -w verify -t 5

run_test "case" "bdev_gpt_write_zeroes" $testdir/bdevperf/bdevperf -c $testdir/bdev_gpt.conf -q 128 -o 4096 -w write_zeroes -t 1

run_test "suite" "bdev_qos" qos_test_suite



# Temporarily disabled - infinite loop

# if [ $RUN_NIGHTLY -eq 1 ]; then
@@ -266,30 +289,6 @@ run_test "case" "bdev_gpt_write_zeroes" $testdir/bdevperf/bdevperf -c $testdir/b 
	# report_test_completion "nightly_bdev_reset"

# fi



timing_enter qos



# Run bdevperf with QoS disabled first

$testdir/bdevperf/bdevperf -z -m 0x2 -q 256 -o 4096 -w randread -t 60 &

QOS_PID=$!

echo "Process qos testing pid: $QOS_PID"

trap 'killprocess $QOS_PID; exit 1' SIGINT SIGTERM EXIT

waitforlisten $QOS_PID



$rpc_py bdev_null_create $QOS_DEV_1 128 512

waitforbdev $QOS_DEV_1

$rpc_py bdev_null_create $QOS_DEV_2 128 512

waitforbdev $QOS_DEV_2



$rootdir/test/bdev/bdevperf/bdevperf.py perform_tests &

qos_function_test



$rpc_py bdev_null_delete $QOS_DEV_1

$rpc_py bdev_null_delete $QOS_DEV_2

killprocess $QOS_PID

trap - SIGINT SIGTERM EXIT



timing_exit qos



if grep -q Nvme0 $testdir/bdev.conf; then

	part_dev_by_gpt $testdir/bdev.conf Nvme0n1 $rootdir reset

fi