From 0da3d74c1117a6c859da4dec34e739988ed6c5fd Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Fri, 16 Nov 2018 14:41:28 -0700 Subject: [PATCH] LU-10576 tests: allow log files to be created/removed Allow an llog file to be created or removed during the course of the test, as this can happen due to internal housekeeping activity. Also ensure that background cleanup has finished with ZFS before fetching the number of objects from the MDT. Test-Parameters: trivial Test-Parameters: testlist=sanity mdscount=2 mdtcount=4 mdtfilesystemtype=zfs ostfilesystemtype=zfs Signed-off-by: Andreas Dilger Change-Id: I0a0968cfcd90c7493c67b54ba8a7f326163ebbe5 Reviewed-on: https://review.whamcloud.com/33677 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Patrick Farrell Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 500d660..daa2fab 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -19623,11 +19623,12 @@ test_803() { done sync; sleep 3 + wait_delete_completed # ensure old test cleanups are finished echo "before create:" $LFS df -i $MOUNT local before_used=$($LFS df -i | grep MDT0000_UUID | awk '{print $3}') - for ((i=0; i<10; i++)); do + for i in {1..10}; do $LFS mkdir -c 1 -i 1 $DIR/$tdir/foo$i || error "Fail to create $DIR/$tdir/foo$i" done @@ -19637,10 +19638,11 @@ test_803() { $LFS df -i $MOUNT local after_used=$($LFS df -i | grep MDT0000_UUID | awk '{print $3}') - [ $after_used -ge $((before_used + 10)) ] || + # allow for an llog to be cleaned up during the test + [ $after_used -ge $((before_used + 10 - 1)) ] || error "before ($before_used) + 10 > after ($after_used)" - for ((i=0; i<10; i++)); do + for i in {1..10}; do rm -rf $DIR/$tdir/foo$i || error "Fail to remove $DIR/$tdir/foo$i" done @@ -19649,11 +19651,11 @@ test_803() { wait_delete_completed echo "after unlink:" $LFS df -i $MOUNT - before_used=$after_used after_used=$($LFS df -i | grep MDT0000_UUID | awk '{print $3}') - [ $after_used -le $((before_used - 8)) ] || - error "before ($before_used) - 8 < after ($after_used)" + # allow for an llog to be created during the test + [ $after_used -le $((before_used + 1)) ] || + error "after ($after_used) > before ($before_used) + 1" } run_test 803 "verify agent object for remote object" -- 1.8.3.1