From 00572286624d46a539861c48d95bebf003239d40 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Mon, 13 May 2024 11:09:55 -0700 Subject: [PATCH] LU-16623 tests: interop sanity-flr/202 sanity-pfl/15 Fix interop testing with sanity-flr test_202 and sanity-pfl test_15 to request a specific number of stripes instead of "-c -1", which may not always allocate objects on all OSTs if they are full/busy. Test-Parameters: trivial Test-Parameters: testlist=sanity-flr env=ONLY=202 serverjob=lustre-master serverbuildno=4527 Test-Parameters: testlist=sanity-pfl env=ONLY=15 serverjob=lustre-master serverbuildno=4527 Fixes: ced540165e ("LU-16623 lod: handle object allocation consistently") Signed-off-by: Andreas Dilger Change-Id: I1df9324d9d978e9253f7d4a433d85934c33ebbe5 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/53628 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: Alex Deiter Reviewed-by: Oleg Drokin --- lustre/tests/sanity-flr.sh | 4 ++-- lustre/tests/sanity-pfl.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre/tests/sanity-flr.sh b/lustre/tests/sanity-flr.sh index 8e8cdaf..6151928 100644 --- a/lustre/tests/sanity-flr.sh +++ b/lustre/tests/sanity-flr.sh @@ -3228,10 +3228,10 @@ test_202() { ids=($($LFS getstripe $tf | awk '/lcme_id/{print $2}' | tr '\n' ' ')) verify_comp_attr stripe-count $tf ${ids[0]} 1 - $LFS setstripe --component-add -E 2M -c -1 $tf + $LFS setstripe --component-add -E 2M -c $OSTCOUNT $tf ids=($($LFS getstripe $tf | awk '/lcme_id/{print $2}' | tr '\n' ' ')) verify_comp_attr stripe-count $tf ${ids[0]} 1 - verify_comp_attr stripe-count $tf ${ids[1]} -1 + verify_comp_attr stripe-count $tf ${ids[1]} $OSTCOUNT dd if=/dev/zero of=$tf bs=1M count=2 ids=($($LFS getstripe $tf | awk '/lcme_id/{print $2}' | tr '\n' ' ')) diff --git a/lustre/tests/sanity-pfl.sh b/lustre/tests/sanity-pfl.sh index ec827df..4b26498 100644 --- a/lustre/tests/sanity-pfl.sh +++ b/lustre/tests/sanity-pfl.sh @@ -878,8 +878,8 @@ test_15() { $LFS setstripe -E 1M -S 1M -E 10M -E eof $parent/f1 || error "create f1" $LFS setstripe -E 4M -E 20M -E eof $parent/f2 || error "create f2" test_mkdir $parent/subdir - $LFS setstripe -E 6M -S 1M -c1 -E 30M -c4 -E eof -c -1 $parent/subdir || - error "setstripe to subdir" + $LFS setstripe -E 6M -S 1M -c1 -E 30M -c4 -E eof -c $OSTCOUNT \ + $parent/subdir || error "setstripe to subdir" $LFS setstripe -E 8M -E eof $parent/subdir/f3 || error "create f3" $LFS setstripe -c 1 $parent/subdir/f4 || error "create f4" -- 1.8.3.1