From 2bf51212680b3d4117925965c368d53587bf37d4 Mon Sep 17 00:00:00 2001 From: Bobi Jam Date: Mon, 11 Mar 2024 10:47:25 +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. 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/fs/lustre-release/+/54345 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Yang Sheng Reviewed-by: Oleg Drokin --- 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 7ed4281..b1c05df 100644 --- a/lustre/tests/sanity-flr.sh +++ b/lustre/tests/sanity-flr.sh @@ -3403,7 +3403,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