Commit 092360ce authored by GangCao's avatar GangCao Committed by Changpeng Liu
Browse files

QoS: check whether to enable the QoS testing on iSCSI 



Added a check whether to enable the QoS testing on iSCSI considering
VM or host has different performance data.

Change-Id: Iaf906ded70c3075fb3306e2301d638d613ec74dd
Signed-off-by: default avatarGangCao <gang.cao@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/447133


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 20511171

test/iscsi_tgt/qos/qos.sh

+36 −23
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ source $rootdir/test/iscsi_tgt/common.sh 
function check_qos_works_well() {

	local enable_limit=$1

	local qos_limit=$2

	local check_qos=$4

	local retval=0



	if [ $LIMIT_TYPE = BANDWIDTH ]; then
@@ -40,10 +41,16 @@ function check_qos_works_well() { 
	else

		retval=$(echo "$read_result > $qos_limit" | bc)

		if [ $retval -eq 0 ]; then

			if [ $check_qos = true ]; then

				echo "$read_result less than $qos_limit - exit QoS testing"

				ENABLE_QOS=false

				exit 0

			else

				echo "$read_result less than $qos_limit - expected greater than"

				exit 1

			fi

		fi

	fi

}



if [ -z "$TARGET_IP" ]; then
@@ -60,6 +67,7 @@ timing_enter qos 


MALLOC_BDEV_SIZE=64

MALLOC_BLOCK_SIZE=512

ENABLE_QOS=true

IOPS_LIMIT=20000

BANDWIDTH_LIMIT=20

READ_BANDWIDTH_LIMIT=10
@@ -93,32 +101,37 @@ iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT 


trap "iscsicleanup; killprocess $pid; exit 1" SIGINT SIGTERM EXIT



# Check whether to enable the QoS testing.

check_qos_works_well false $IOPS_LIMIT Malloc0 true



if [ $ENABLE_QOS = true ]; then

	# Limit the I/O rate by RPC, then confirm the observed rate matches.

	$rpc_py set_bdev_qos_limit Malloc0 --rw_ios_per_sec $IOPS_LIMIT

check_qos_works_well true $IOPS_LIMIT Malloc0

	check_qos_works_well true $IOPS_LIMIT Malloc0 false



	# Now disable the rate limiting, and confirm the observed rate is not limited anymore.

	$rpc_py set_bdev_qos_limit Malloc0 --rw_ios_per_sec 0

check_qos_works_well false $IOPS_LIMIT Malloc0

	check_qos_works_well false $IOPS_LIMIT Malloc0 false



	# Limit the I/O rate again.

	$rpc_py set_bdev_qos_limit Malloc0 --rw_ios_per_sec $IOPS_LIMIT

check_qos_works_well true $IOPS_LIMIT Malloc0

	check_qos_works_well true $IOPS_LIMIT Malloc0 false

	echo "I/O rate limiting tests successful"



	# Limit the I/O bandwidth rate by RPC, then confirm the observed rate matches.

	LIMIT_TYPE=BANDWIDTH

	$rpc_py set_bdev_qos_limit Malloc0 --rw_ios_per_sec 0 --rw_mbytes_per_sec $BANDWIDTH_LIMIT

check_qos_works_well true $BANDWIDTH_LIMIT Malloc0

	check_qos_works_well true $BANDWIDTH_LIMIT Malloc0 false



	# Now disable the bandwidth rate limiting, and confirm the observed rate is not limited anymore.

	$rpc_py set_bdev_qos_limit Malloc0 --rw_mbytes_per_sec 0

check_qos_works_well false $BANDWIDTH_LIMIT Malloc0

	check_qos_works_well false $BANDWIDTH_LIMIT Malloc0 false



	# Limit the I/O bandwidth rate again with both read/write and read/only.

	$rpc_py set_bdev_qos_limit Malloc0 --rw_mbytes_per_sec $BANDWIDTH_LIMIT --r_mbytes_per_sec $READ_BANDWIDTH_LIMIT

check_qos_works_well true $READ_BANDWIDTH_LIMIT Malloc0

	check_qos_works_well true $READ_BANDWIDTH_LIMIT Malloc0 false

	echo "I/O bandwidth limiting tests successful"

fi



iscsicleanup

$rpc_py delete_target_node 'iqn.2016-06.io.spdk:Target1'