From 0a94395230e7482029ff03381bf77b4783a93e2d Mon Sep 17 00:00:00 2001
From: Hongchao Zhang <hongchao@whamcloud.com>
Date: Tue, 28 Feb 2023 19:48:28 -0500
Subject: [PATCH] LU-16529 test: wait quota synced on quota slaves

Check and wait the quota setting to be synchronized on
quota slaves before running actual sanity-quota test_84.

Test-Parameters: trivial testlist=sanity-quota env=ONLY=84,ONLY_REPEAT=100
Fixes: a2fd4d3aee ("LU-15880 quota: fix insane grant quota")
Signed-off-by: Hongchao Zhang <hongchao@whamcloud.com>
Change-Id: I7752bff33f24d1d38dc340b2addbfc98d6f7c857
---
 lustre/tests/sanity-quota.sh | 51 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index 2a422df..b1dc399 100755
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -495,6 +495,55 @@ reset_quota_settings() {
 	sleep 1
 }
 
+get_quota_on_qsd() {
+	local facet
+	local spec
+	local qid
+	local qtype
+	local output
+
+	facet=$1
+	case "$2" in
+		usr) qtype="limit_user";;
+		grp) qtype="limit_group";;
+		*)	   error "unknown quota parameter $2";;
+	esac
+
+	qid=$3
+	case "$4" in
+		hardlimit) spec=4;;
+		softlimit) spec=6;;
+		*)	   error "unknown quota parameter $4";;
+	esac
+
+	do_facet $facet $LCTL get_param osd-*.*-OST0000.quota_slave.$qtype |
+		awk '($3 == '$qid') {getline; print $'$spec'; exit;}' | tr -d ,
+}
+
+wait_quota_setting_synced() {
+	local value
+	local qtype=$1
+	local qid=$2
+	local limit_type=$3
+	local limit_val=$4
+	local interval=0
+
+	value=$(get_quota_on_qsd ost1 $qtype $qid $limit_type)
+	while [[ $value != $limit_val ]]; do
+		(( interval != 0 )) ||
+			do_facet ost1 $LCTL set_param \
+				osd-*.*-OST0000.quota_slave.force_reint=1
+
+		(( interval <= 20 )) ||
+			error "quota ($value) don't update on QSD, $limit_val"
+
+		interval=$((interval + 1))
+		sleep 1
+
+		value=$(get_quota_on_qsd ost1 $qtype $qid $limit_type)
+	done
+}
+
 # enable quota debug
 quota_init() {
 	do_nodes $(comma_list $(nodes_list)) \
@@ -5676,6 +5725,8 @@ test_84()
                 error "set user quota failed"
 	$LFS quota -gv $TSTUSR $DIR
 
+	wait_quota_setting_synced "grp" $TSTID "hardlimit" $((10*1024*1024))
+
 	mkdir -p $dir1 || error "failed to mkdir"
 	chown $TSTUSR.$TSTUSR $dir1 || error "chown $dir1 failed"
 
-- 
1.8.3.1