LU-14704 tests: disable opencache for sanity/29

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

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 9edc416..3039059 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -3390,6 +3390,11 @@ run_test 28 "create/mknod/mkdir with bad file types ============"
 test_29() {
        [ $PARALLEL == "yes" ] && skip "skip parallel run"
 
+       [ $MDS1_VERSION -ge $(version_code 2.14.51) ] && {
+               disable_opencache
+               stack_trap "restore_opencache"
+       }
+
        sync; sleep 1; sync # flush out any dirty pages from previous tests
        cancel_lru_locks
        test_mkdir $DIR/d29
@@ -20389,6 +20394,24 @@ test_230v()
 }
 run_test 230v "subdir migrated to the MDT where its parent is located"
 
+test_230w() {
+       (( MDSCOUNT > 1 )) || skip "needs >= 2 MDTs"
+       (( MDS1_VERSION >= $(version_code 2.14.53) )) ||
+               skip "Need MDS version at least 2.14.53"
+
+       mkdir -p $DIR/$tdir/sub || error "mkdir failed"
+
+       $LFS migrate -m 1 -c $MDSCOUNT -d $DIR/$tdir ||
+               error "migrate failed"
+
+       (( $($LFS getdirstripe -c $DIR/$tdir) == MDSCOUNT )) ||
+               error "$tdir stripe count mismatch"
+
+       (( $($LFS getdirstripe -c $DIR/$tdir/sub) == 0 )) ||
+               error "$tdir/sub is striped"
+}
+run_test 230w "non-recursive mode dir migration"
+
 test_231a()
 {
        # For simplicity this test assumes that max_pages_per_rpc
@@ -27559,15 +27582,24 @@ test_817() {
 run_test 817 "nfsd won't cache write lock for exec file"
 
 test_818() {
-       mkdir $DIR/$tdir
-       $LFS setstripe -c1 -i0 $DIR/$tfile
-       $LFS setstripe -c1 -i1 $DIR/$tfile
+       test_mkdir -i0 -c1 $DIR/$tdir
+       $LFS setstripe -c1 -i0 $DIR/$tdir/$tfile
+       $LFS setstripe -c1 -i1 $DIR/$tdir/$tfile
        stop $SINGLEMDS
+
+       # restore osp-syn threads
+       stack_trap "fail $SINGLEMDS"
+
        #define OBD_FAIL_OSP_CANT_PROCESS_LLOG          0x2105
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80002105
        start $SINGLEMDS $(mdsdevname ${SINGLEMDS//mds/}) $MDS_MOUNT_OPTS ||
                error "start $SINGLEMDS failed"
        rm -rf $DIR/$tdir
+
+       local testid=$(echo $TESTNAME | tr '_' ' ')
+
+       do_facet mds1 dmesg | tac | sed "/$testid/,$ d" |
+               grep "run LFSCK" || error "run LFSCK is not suggested"
 }
 run_test 818 "unlink with failed llog"