From: Etienne AUJAMES <etienne.aujames@cea.fr>
Date: Fri, 21 Jan 2022 14:49:18 +0000 (+0100)
Subject: LU-15467 tests: fix sanity-hsm test_103a timeout issue
X-Git-Tag: 2.15.0-RC3~32
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=98e1e41ce47c95155a8c8d452eef5074492d22f0;p=fs%2Flustre-release.git

LU-15467 tests: fix sanity-hsm test_103a timeout issue

Add check mds version in "sanity-hsm test_103a" for interop test.
Limit the number of parralel hsm restore requests to
max_rpcs_in_flight.

Fixes: b449f3d ("LU-15145 hsm: unlock the restore layout lock for a cancel")
Test-Parameters: trivial
Test-Parameters: testlist=sanity-hsm env=ONLY=103a,ONLY_REPEAT=20
Test-Parameters: testlist=sanity-hsm
Signed-off-by: Etienne AUJAMES <etienne.aujames@cea.fr>
Change-Id: I78098042d1316cdcc9d2e25860099a0ffdba2503
Reviewed-on: https://review.whamcloud.com/46252
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Alena Nikitenko <anikitenko@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh
index 482956b..8402063 100755
--- a/lustre/tests/sanity-hsm.sh
+++ b/lustre/tests/sanity-hsm.sh
@@ -3517,6 +3517,9 @@ test_103() {
 run_test 103 "Purge all requests"
 
 test_103a() {
+	(( MDS1_VERSION >= $(version_code 2.14.56) )) ||
+		skip "Need MDS version at least 2.14.56"
+
 	cdt_clear_non_blocking_restore
 
 	# test needs a running copytool
@@ -3524,9 +3527,12 @@ test_103a() {
 
 	local -a fids=()
 	local i
+	local rpcs_inflight=$($LCTL get_param -n \
+		"mdc.$(facet_svc mds1)*.max_rpcs_in_flight" |
+		head -n1)
 
 	mkdir_on_mdt0 $DIR/$tdir
-	for i in {0..9}; do
+	for ((i=0; i < rpcs_inflight; i++)); do
 		fids+=( $(copy_file /etc/passwd $DIR/$tdir/${tfile}_$i) )
 	done
 	$LFS hsm_archive --archive $HSM_ARCHIVE_NUMBER $DIR/$tdir/*