From c72beccfc0ef602991cc58d0693b1adcd6adf330 Mon Sep 17 00:00:00 2001 From: Bobi Jam Date: Fri, 8 Mar 2024 15:07:59 +0800 Subject: [PATCH] LU-14869 test: improve sanity-flr/200a Make sure "flock -x" successfully returned before running mirror resync so that it won't get into running read holding shared flock. Lustre-change: https://review.whamcloud.com/54345 Lustre-commit: TBD (from 2ff02fec932ab6e00a4942517db76f48412db31a) Test-Parameters: trivial testlist=sanity-flr env=ONLY=200a,ONLY_REPEAT=10 Test-Parameters: trivial testlist=sanity-flr env=ONLY=200a,ONLY_REPEAT=10 Test-Parameters: trivial testlist=sanity-flr env=ONLY=200a,ONLY_REPEAT=10 Test-Parameters: trivial testlist=sanity-flr env=ONLY=200a,ONLY_REPEAT=10 Test-Parameters: trivial testlist=sanity-flr env=ONLY=200a,ONLY_REPEAT=10 Signed-off-by: Bobi Jam Change-Id: I6383af5d5761980d24af19efd4a4ac899f369a7d Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/54328 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- lustre/tests/sanity-flr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lustre/tests/sanity-flr.sh b/lustre/tests/sanity-flr.sh index bf38e49..647760d 100644 --- a/lustre/tests/sanity-flr.sh +++ b/lustre/tests/sanity-flr.sh @@ -3384,7 +3384,7 @@ resync_file_200() { echo -n "resync file $tf with '$cmd' .." if [[ $lock_taken = "true" ]]; then - flock -x 200 + flock -x 200 && $cmd $tf &> /dev/null && echo "done" || echo "failed" flock -u 200 else -- 1.8.3.1