From: Vladimir Saveliev <vlaidimir.saveliev@hpe.com>
Date: Wed, 10 Oct 2018 12:08:49 +0000 (-0400)
Subject: LU-13911 tests: take osc max_rpcs_in_flight limit into account
X-Git-Tag: 2.15.0-RC1~62
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=98c08ce83c9db6bee1513fc914ca075325bfae3c;p=fs%2Flustre-release.git

LU-13911 tests: take osc max_rpcs_in_flight limit into account

max_rpcs_in_flight for osc is limited to 256. sanity.sh:test_115()
tries to set it to ost.OSS.ost_io.threads_started * 4. The test should
make sure that it does not exceed 256.

HPE-bug-id: LUS-5917
Signed-off-by: Vladimir Saveliev <vlaidimir.saveliev@hpe.com>
Change-Id: I38929e1ed0fe7855e7e60ea43742740c01ae1bd8
Reviewed-on: https://review.whamcloud.com/39687
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Elena Gryaznova <elena.gryaznova@hpe.com>
Reviewed-by: Patrick Farrell <pfarrell@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index a3ffd8c..6d34476 100755
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -11813,6 +11813,12 @@ test_115() {
 	echo "Starting with $OSTIO_pre threads"
 	local thread_max=$((OSTIO_pre * 2))
 	local rpc_in_flight=$((thread_max * 2))
+	# this is limited to OSC_MAX_RIF_MAX (256)
+	[ $rpc_in_flight -gt 256 ] && rpc_in_flight=256
+	thread_max=$((rpc_in_flight / 2))
+	[ $thread_max -le $OSTIO_pre ] && skip "Too many ost_io threads" &&
+		return
+
 	# Number of I/O Process proposed to be started.
 	local nfiles
 	local facets=$(get_facets OST)