From: Hongchao Zhang <hongchao@whamcloud.com>
Date: Thu, 11 Jul 2019 08:20:33 +0000 (-0400)
Subject: LU-11768 test: limit at_max to timeout in time
X-Git-Tag: 2.12.4-RC1~105
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F65%2F36365%2F2;p=fs%2Flustre-release.git

LU-11768 test: limit at_max to timeout in time

In test_6 of sanity-quota, if the AT is enabled, the timeout of
the QUOTA_DQACQ request could be longer than OBD_TIMEOUT*2, which
cause the watchdog to be triggered.

This is a backport to Lustre b2_12 of
Lustre-change: https://review.whamcloud.com/35651
Lustre-commit: d8226b9353dbc1448af8d23c13cae5f21cbe3a86

Change-Id: I7e3a976a004259f5c956fc48f4d8d63c751ee2c0
Signed-off-by: Hongchao Zhang <hongchao@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Wang Shilong <wshilong@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/36365
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
---

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index a098219..50a88b3 100755
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -1204,6 +1204,11 @@ test_6() {
 	#define OBD_FAIL_PTLRPC_DROP_REQ_OPC 0x513
 	lustre_fail mds 0x513 601
 
+	if at_is_enabled; then
+		at_max_saved=$(at_max_get ost1)
+		at_max_set $TIMEOUT ost1
+	fi
+
 	do_facet ost1 $LCTL set_param \
 			osd-*.$FSNAME-OST*.quota_slave.timeout=$((TIMEOUT / 2))
 
@@ -1220,6 +1225,8 @@ test_6() {
 	echo "Sleep for $((TIMEOUT * 2 + 1)) seconds ..."
 	sleep $((TIMEOUT * 2 + 1))
 
+	[ $at_max_saved -ne 0 ] && at_max_set $at_max_saved ost1
+
 	# write should be blocked and never finished
 	if ! ps -p $DDPID  > /dev/null 2>&1; then
 		lustre_fail mds 0 0