LU-11206 tests: Use import_ready to check IDLE

[fs/lustre-release.git] / lustre / tests / sanity.sh

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index e78788a..8b858b6 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -1387,6 +1387,26 @@ test_24E() {
 }
 run_test 24E "cross MDT rename/link"
 
+test_24F () {
+       [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return 0
+
+       local repeats=1000
+       [ "$SLOW" = "no" ] && repeats=100
+
+       mkdir -p $DIR/$tdir
+
+       echo "$repeats repeats"
+       for ((i = 0; i < repeats; i++)); do
+               $LFS mkdir -i0 -c2 $DIR/$tdir/test || error "mkdir fails"
+               touch $DIR/$tdir/test/a || error "touch fails"
+               mkdir $DIR/$tdir/test/b || error "mkdir fails"
+               rm -rf $DIR/$tdir/test || error "rmdir fails"
+       done
+
+       true
+}
+run_test 24F "hash order vs readdir (LU-11330)"
+
 test_25a() {
        echo '== symlink sanity ============================================='
 
@@ -8668,7 +8688,7 @@ test_104a() {
        lfs df || error "lfs df with deactivated OSC failed"
        lctl --device %$OSC activate
        # wait the osc back to normal
-       wait_osc_import_state client ost FULL
+       wait_osc_import_ready client ost
 
        lfs df || error "lfs df with reactivated OSC failed"
        rm -f $DIR/$tfile
@@ -19188,8 +19208,7 @@ run_test 408 "drop_caches should not hang due to page leaks"
 
 test_409()
 {
-       [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs"
-       check_mount_and_prep
+       [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs"
 
        mkdir -p $DIR/$tdir || error "(0) Fail to mkdir"
        $LFS mkdir -i 1 -c 2 $DIR/$tdir/foo || error "(1) Fail to mkdir"
@@ -19213,6 +19232,7 @@ test_409()
        echo "Unlink hard links start at $(date)"
        unlinkmany $DIR/$tdir/foo/${PREFIX}_ 1000 ||
                error "(7) Fail to unlink"
+       echo "Unlink hard links finished at $(date)"
 }
 run_test 409 "Large amount of cross-MDTs hard links on the same file"