LU-3660 acl: support mount option "noacl" for zfs

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

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 13f112c..d2c7a48 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -6840,7 +6840,7 @@ run_acl_subtest()
     return $?
 }
 
-test_103 () {
+test_103a() {
        [ "$UID" != 0 ] && skip_env "must run as root" && return
        [ -z "$(lctl get_param -n mdc.*-mdc-*.connect_flags | grep acl)" ] &&
                skip "must have acl enabled" && return
@@ -6901,7 +6901,43 @@ test_103 () {
                fi
        done
 }
-run_test 103 "acl test ========================================="
+run_test 103a "acl test ========================================="
+
+test_103b() {
+        local noacl=false
+        local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/})
+        local mountopts=$MDS_MOUNT_OPTS
+
+        if [[ "$MDS_MOUNT_OPTS" =~ "noacl" ]]; then
+                noacl=true
+        else
+                # stop the MDT
+                stop $SINGLEMDS || error "failed to stop MDT."
+                # remount the MDT
+                if [ -z "$MDS_MOUNT_OPTS" ]; then
+                        MDS_MOUNT_OPTS="-o noacl"
+                else
+                        MDS_MOUNT_OPTS="${MDS_MOUNT_OPTS},noacl"
+                fi
+                start $SINGLEMDS $MDT_DEV $MDS_MOUNT_OPTS ||
+                        error "failed to start MDT."
+                MDS_MOUNT_OPTS=$mountopts
+        fi
+
+        touch $DIR/$tfile
+        setfacl -m u:bin:rw $DIR/$tfile && error "setfacl should fail"
+
+        if ! $noacl; then
+                # stop the MDT
+                stop $SINGLEMDS || error "failed to stop MDT."
+                # remount the MDT
+                start $SINGLEMDS $MDT_DEV $MDS_MOUNT_OPTS ||
+                        error "failed to start MDT."
+        fi
+
+        rm -f $DIR/$tfile
+}
+run_test 103b "MDS mount option \"noacl\" ======================="
 
 test_104a() {
        [ $PARALLEL == "yes" ] && skip "skip parallel run" && return
@@ -9670,6 +9706,17 @@ test_154d() {
 }
 run_test 154d "Verify open file fid"
 
+test_154e()
+{
+       [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.6.50) ]] &&
+               skip "Need MDS version at least 2.6.50" && return
+
+       if ls -a $MOUNT | grep -q '^\.lustre$'; then
+               error ".lustre returned by readdir"
+       fi
+}
+run_test 154e ".lustre is not returned by readdir"
+
 test_155_small_load() {
     local temp=$TMP/$tfile
     local file=$DIR/$tfile
@@ -12717,6 +12764,26 @@ test_239() {
 }
 run_test 239 "osp_sync test"
 
+test_240() {
+       [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+
+       mkdir -p $DIR/$tdir
+
+       $LFS mkdir -i 0 $DIR/$tdir/d0 ||
+               error "failed to mkdir $DIR/$tdir/d0 on MDT0"
+       $LFS mkdir -i 1 $DIR/$tdir/d0/d1 ||
+               error "failed to mkdir $DIR/$tdir/d0/d1 on MDT1"
+
+       umount_client $MOUNT || error "umount failed"
+       #define OBD_FAIL_TGT_DELAY_CONDITIONAL   0x713
+       do_facet mds2 lctl set_param fail_loc=0x713 fail_val=1
+       mount_client $MOUNT || error "failed to mount client"
+
+       echo "stat $DIR/$tdir/d0/d1, should not fail/ASSERT"
+       stat $DIR/$tdir/d0/d1 || error "fail to stat $DIR/$tdir/d0/d1"
+}
+run_test 240 "race between ldlm enqueue and the connection RPC (no ASSERT)"
+
 cleanup_test_300() {
        trap 0
        umask $SAVE_UMASK