From: Alex Zhuravlev <bzzz@whamcloud.com>
Date: Wed, 19 Apr 2023 07:20:33 +0000 (+0300)
Subject: LU-15123 tests: check quota reintegration after recovery
X-Git-Tag: 2.15.4-RC1~52
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=13805e3a2d4f520e297bc408d94b9971a6094f9a;p=fs%2Flustre-release.git

LU-15123 tests: check quota reintegration after recovery

4th step of quota reintegration (reconciliation) waits for recovery
completion. So the tests (like sanity-quota/7a) should wait for
recovery completion before checking reintegration results.

Lustre-change: https://review.whamcloud.com/50688
Lustre-commit: 4432b6e2824775e292f96e202d6fc0db231bc749

Signed-off-by: Alex Zhuravlev <bzzz@whamcloud.com>
Change-Id: Id0aa5db01658621103d94ad6dafe91b2960b3a33
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Sergey Cheremencev <scherementsev@ddn.com>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/51233
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index f552d84..047b1a9 100755
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -285,6 +285,8 @@ wait_reintegration() {
 		cmd=${cmd}.quota_slave.info
 
 		if $(facet_up $tgt); then
+			# reintegration starts after recovery completion
+			wait_recovery_complete $tgt
 			wait_update_facet $tgt "$cmd |
 				grep "$qtype" | awk '{ print \\\$3 }'" \
 					"$result" $max || return 1