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.

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

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index d6ab103..e3c2386 100755 (executable)
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -289,6 +289,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