LU-14094 tests: give zfs more wait time to unlink

In sanity.sh test_311, give zfs more wait time to unlink more
files as expected.

Test-Parameters: trivial fstype=zfs testlist=sanity env=ONLY=311,ONLY_REPEAT=200
Test-Parameters: trivial fstype=zfs testlist=sanity env=ONLY=311,ONLY_REPEAT=200
Test-Parameters: trivial fstype=zfs testlist=sanity env=ONLY=311,ONLY_REPEAT=200
Test-Parameters: trivial fstype=zfs testlist=sanity env=ONLY=311,ONLY_REPEAT=200
Test-Parameters: trivial fstype=zfs testlist=sanity env=ONLY=311,ONLY_REPEAT=200
Signed-off-by: Emoly Liu <emoly@whamcloud.com>
Change-Id: I17f278df3826fa38b71713c610d644cc7676c1ad
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56952
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Mikhail Pershin <mpershin@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index e07ea6f..66ba3dc 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -28422,6 +28422,7 @@ test_311() {
 
        unlinkmany $DIR/$tdir/$tfile. 1000
        wait_delete_completed
+       wait_zfs_commit $SINGLEMDS 10
 
        do_nodes $mdts "$LCTL set_param -n \
                        osp.*OST0000*.max_create_count=$max_count"
@@ -28443,7 +28444,7 @@ test_311() {
 
        echo -e "\nwaited $i sec, old Iused $old_iused, new Iused $new_iused"
        ((old_iused - new_iused > 400)) ||
-               error "objs not destroyed after unlink $new_iused > $old_iused"
+               error "objs not destroyed after unlink"
 }
 run_test 311 "disable OSP precreate, and unlink should destroy objs"
 

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 27301e1..61c8274 100755 (executable)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -3606,7 +3606,7 @@ wait_zfs_commit() {
        # the occupied disk space will be released
        # only after TXGs are committed
        if [[ $(facet_fstype $1) == zfs ]]; then
-               echo "sleep $zfs_wait for ZFS $(facet_fstype $1)"
+               echo "sleep $zfs_wait for ZFS $(facet_type $1)"
                sleep $zfs_wait
        fi
 }