From: Etienne AUJAMES <etienne.aujames@cea.fr>
Date: Wed, 11 May 2022 07:26:01 +0000 (+0200)
Subject: LU-15839 tests: correct the ZFS grace time for sanity-quota 4a
X-Git-Tag: 2.15.51~95
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=8f306f00c02e5455cef48d227f28e8cb90127719

LU-15839 tests: correct the ZFS grace time for sanity-quota 4a

For  sanity-quota 4a, the grace time is increased from 12s to 20s but
not actually set on filesystem.

Fixes: 3e4c3fdc ("LU-6836 test: re-add test 4a to sanity-quota for ZFS")
Test-Parameters: fstype=zfs testlist=sanity-quota env=ONLY=4a,ONLY_REPEAT=100
Signed-off-by: Etienne AUJAMES <eaujames@ddn.com>
Change-Id: I2324e818a42a19bc9928f127b1622f1e5274db1f
Reviewed-on: https://review.whamcloud.com/47289
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Sergey Cheremencev <sergey.cheremencev@hpe.com>
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 d36cefe..a4a33ba 100755
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -1711,6 +1711,7 @@ test_4a() {
 	local TESTFILE=$DIR/$tdir/$tfile-0
 	local GRACE=12
 
+	[ "$mds1_FSTYPE" = zfs ] && GRACE=20
 	set_mdt_qtype $QTYPE || error "enable mdt quota failed"
 
 	echo "User quota (soft limit:$LIMIT files  grace:$GRACE seconds)"
@@ -1723,8 +1724,6 @@ test_4a() {
 	$LFS setquota -u $TSTUSR -b 0 -B 0 -i $LIMIT -I 0 $DIR ||
 		error "set user quota failed"
 
-	[ "$mds1_FSTYPE" = zfs ] && GRACE=20
-
 	test_file_soft $TESTFILE $LIMIT $GRACE "u"
 
 	echo "Group quota (soft limit:$LIMIT files  grace:$GRACE seconds)"