From: Andreas Dilger <adilger@whamcloud.com>
Date: Tue, 1 Oct 2024 21:06:06 +0000 (-0600)
Subject: LU-14330 tests: wait for orphan thread to exit
X-Git-Tag: 2.16.0-RC5~4
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F59%2F56559%2F3;p=fs%2Flustre-release.git

LU-14330 tests: wait for orphan thread to exit

It may take a few seconds for the orphan cleanup thread to finish.
Wait for the thread to exit rather than failing the test.

Test-Parameters: trivial
Fixes: a1e6e75a82 ("LU-12846 tests: verify orphan upgrade compatibilty")
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: I604be1b9f8f460d9183ba1aaddd3b77e153ebbe5
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56559
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Artem Blagodarenko <ablagodarenko@ddn.com>
Reviewed-by: Alex Deiter <adeiter@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index ec2abe75..3b7dc9b 100755
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -3201,7 +3201,7 @@ t32_test() {
 					return 1
 		fi
 
-		[[ $(do_facet mds1 pgrep orph_.*-MDD | wc -l) == 0 ]] ||
+		wait_update_facet mds1 "pgrep orph_.*-MDD | wc -l" "0" ||
 			error "MDD orphan cleanup thread not quit"
 
 		umount $tmp/mnt/lustre || {