LU-4253 osc: Don't flush active extents.

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

diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh
index 45d5dc9..16cfedb 100644 (file)
--- a/lustre/tests/sanityn.sh
+++ b/lustre/tests/sanityn.sh
@@ -40,9 +40,12 @@ init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
-[ $(facet_fstype $SINGLEMDS) = "zfs" ] &&
+if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then
 # bug number for skipped test:        LU-2840 LU-2189 LU-2776
        ALWAYS_EXCEPT="$ALWAYS_EXCEPT 21      36      51a"
+# LU-2829 / LU-2887 - make allowances for ZFS slowness
+       TEST33_NFILES=${TEST33_NFILES:-1000}
+fi
 
 [ "$SLOW" = "no" ] && EXCEPT_SLOW="33a"
 
@@ -489,7 +492,8 @@ test_21() { # Bug 5907
 run_test 21 " Try to remove mountpoint on another dir ===="
 
 test_23() { # Bug 5972
-       local at_diff=$(do_facet $SINGLEMDS $LCTL get_param -n mdd.*.atime_diff)
+       local at_diff=$(do_facet $SINGLEMDS \
+               $LCTL get_param -n mdd.*MDT0000*.atime_diff | head -1)
        echo "atime should be updated while another read" > $DIR1/$tfile
 
        # clear the lock(mode: LCK_PW) gotten from creating operation
@@ -2479,6 +2483,8 @@ run_test 71 "correct file map just after write operation is finished"
 
 test_72() {
        local p="$TMP/sanityN-$TESTNAME.parameters"
+       local tlink1
+       local tlink2
        save_lustre_params client "llite.*.xattr_cache" > $p
        lctl set_param llite.*.xattr_cache 1 ||
                { skip "xattr cache is not supported"; return 0; }
@@ -2492,6 +2498,14 @@ test_72() {
                error "setfattr2 failed"
        getfattr -n user.attr1 $DIR1/$tfile | grep value2 ||
                error "getfattr2 failed"
+
+       # check that trusted.link is consistent
+       tlink1=$(getfattr -n trusted.link $DIR1/$tfile | md5sum)
+       ln $DIR2/$tfile $DIR2/$tfile-2 || error "failed to link"
+       tlink2=$(getfattr -n trusted.link $DIR1/$tfile | md5sum)
+       echo "$tlink1 $tlink2"
+       [ "$tlink1" = "$tlink2" ] && error "trusted.link should have changed!"
+
        rm -f $DIR2/$tfile
 
        restore_lustre_params < $p
@@ -2525,6 +2539,16 @@ test_73() {
 }
 run_test 73 "getxattr should not cause xattr lock cancellation"
 
+test_74() {
+       [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.4.93) ] &&
+               skip "Need MDS version at least 2.4.93" && return
+
+       dd if=/dev/zero of=$DIR1/$tfile-1 bs=1K count=1
+       dd if=/dev/zero of=$DIR1/$tfile-2 bs=1K count=1
+       flocks_test 4 $DIR1/$tfile-1 $DIR2/$tfile-2
+}
+run_test 74 "flock deadlock: different mounts =============="
+
 log "cleanup: ======================================================"
 
 [ "$(mount | grep $MOUNT2)" ] && umount $MOUNT2