X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-quota.sh;h=2347d59183403fe36edcff9cdb25f396d2aa07ab;hp=210a5796332511ecc2c6186b1438b2b2c0c0aca2;hb=18cd3e1e28afd311e4743dab1011f85fba0e1765;hpb=a11c18cbab00d0300b8f025b45090b08ba748f5e

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index 210a579..2347d59 100755
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -1565,6 +1565,8 @@ test_file_soft() {
 	local LIMIT=$2
 	local grace=$3
 	local qtype=$4
+	local SOFT_LIMIT=$(do_facet $SINGLEMDS $LCTL get_param -n \
+		qmt.$FSNAME-QMT0000.md-0x0.soft_least_qunit)
 
 	setup_quota_test
 	trap cleanup_quota_test EXIT
@@ -1597,12 +1599,8 @@ test_file_soft() {
 	$SHOW_QUOTA_INFO_PROJID
 
 	echo "Create file after timer goes off"
-	# There is a window that space is accounted in the quota usage but
-	# hasn't been decreased from the pending write, if we acquire quota
-	# in this window, we'll acquire more than we needed.
-	$RUNAS touch ${TESTFILE}_after_1 ${TESTFILE}_after_2 || true
-	sync_all_data || true
-	$RUNAS touch ${TESTFILE}_after_3 &&
+	# exceed least soft limit is possible
+	$RUNAS createmany -m ${TESTFILE}_after_3 $((SOFT_LIMIT + 1)) &&
 		quota_error a $TSTUSR "create after timer expired," \
 			"but expect EDQUOT"
 	sync_all_data || true