LU-8730 test: Remove duplicate $dev from conf-sanity test_83

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

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index cd25613..ac29af6 100755 (executable)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -3382,8 +3382,9 @@ cleanup_48() {
        reformat_and_config
 }
 
-test_48() { # bug 17636
-       reformat
+test_48() { # bz-17636 LU-7473
+       local count
+
        setup_noconfig
        check_mount || error "check_mount failed"
 
@@ -3394,14 +3395,36 @@ test_48() { # bug 17636
        $GETSTRIPE $MOUNT/widestripe ||
                error "$GETSTRIPE $MOUNT/widestripe failed"
 
-       trap cleanup_48 EXIT ERR
+       # In the future, we may introduce more EAs, such as selinux, enlarged
+       # LOV EA, and so on. These EA will use some EA space that is shared by
+       # ACL entries. So here we only check some reasonable ACL entries count,
+       # instead of the max number that is calculated from the max_ea_size.
+       if [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.8.57) ];
+       then
+               count=28        # hard coded of RPC protocol
+       elif [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then
+               count=4000      # max_num 4091 max_ea_size = 32768
+       elif ! large_xattr_enabled; then
+               count=450       # max_num 497 max_ea_size = 4012
+       else
+               count=4500      # max_num 8187 max_ea_size = 1048492
+                               # not create too much (>5000) to save test time
+       fi
 
-       # fill acl buffer for avoid expand lsm to them
-       getent passwd | awk -F : '{ print "u:"$1":rwx" }' |  while read acl; do
-           setfacl -m $acl $MOUNT/widestripe
+       echo "It is expected to hold at least $count ACL entries"
+       trap cleanup_48 EXIT ERR
+       for ((i = 0; i < $count; i++)) do
+               setfacl -m u:$((i + 100)):rw $MOUNT/widestripe ||
+                       error "Fail to setfacl for $MOUNT/widestripe at $i"
        done
 
+       cancel_lru_locks mdc
        stat $MOUNT/widestripe || error "stat $MOUNT/widestripe failed"
+       local r_count=$(getfacl $MOUNT/widestripe | grep "user:" | wc -l)
+       count=$((count + 1)) # for the entry "user::rw-"
+
+       [ $count -eq $r_count ] ||
+               error "Expected ACL entries $count, but got $r_count"
 
        cleanup_48
 }
@@ -5905,8 +5928,8 @@ run_test 82b "specify OSTs for file with --pool and --ost-list options"
 test_83() {
        [[ $(lustre_version_code ost1) -ge $(version_code 2.6.91) ]] ||
                { skip "Need OST version at least 2.6.91" && return 0; }
-       if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then
-               skip "Only applicable to ldiskfs-based MDTs"
+       if [ $(facet_fstype ost1) != ldiskfs ]; then
+               skip "Only applicable to ldiskfs-based OSTs"
                return
        fi
 
@@ -5922,7 +5945,7 @@ test_83() {
        # Mount the OST as an ldiskfs filesystem.
        log "mount the OST $dev as a $fstype filesystem"
        add ost1 $(mkfs_opts ost1 $dev) $FSTYPE_OPT \
-               --reformat $dev $dev > /dev/null ||
+               --reformat $dev > /dev/null ||
                error "format ost1 error"
 
        if ! test -b $dev; then
@@ -7312,6 +7335,57 @@ test_103() {
 }
 run_test 103 "rename filesystem name"
 
+test_104() { # LU-6952
+       local mds_mountopts=$MDS_MOUNT_OPTS
+       local ost_mountopts=$OST_MOUNT_OPTS
+       local mds_mountfsopts=$MDS_MOUNT_FS_OPTS
+       local lctl_ver=$(do_facet $SINGLEMDS $LCTL --version |
+                       awk '{ print $2 }')
+
+       [[ $(version_code $lctl_ver) -lt $(version_code 2.9.55) ]] &&
+               { skip "this test needs utils above 2.9.55" && return 0; }
+
+       # specify "acl" in mount options used by mkfs.lustre
+       if [ -z "$MDS_MOUNT_FS_OPTS" ]; then
+               MDS_MOUNT_FS_OPTS="acl,user_xattr"
+       else
+
+               MDS_MOUNT_FS_OPTS="${MDS_MOUNT_FS_OPTS},acl,user_xattr"
+       fi
+
+       echo "mountfsopt: $MDS_MOUNT_FS_OPTS"
+
+       #reformat/remount the MDT to apply the MDT_MOUNT_FS_OPT options
+       formatall
+       if [ -z "$MDS_MOUNT_OPTS" ]; then
+               MDS_MOUNT_OPTS="-o noacl"
+       else
+               MDS_MOUNT_OPTS="${MDS_MOUNT_OPTS},noacl"
+       fi
+
+       for num in $(seq $MDSCOUNT); do
+               start mds$num $(mdsdevname $num) $MDS_MOUNT_OPTS ||
+                       error "Failed to start MDS"
+       done
+
+       for num in $(seq $OSTCOUNT); do
+               start ost$num $(ostdevname $num) $OST_MOUNT_OPTS ||
+                       error "Failed to start OST"
+       done
+
+       mount_client $MOUNT
+       setfacl -m "d:$RUNAS_ID:rwx" $MOUNT &&
+               error "ACL is applied when FS is mounted with noacl."
+
+       MDS_MOUNT_OPTS=$mds_mountopts
+       OST_MOUNT_OPTS=$ost_mountopts
+       MDS_MOUNT_FS_OPTS=$mds_mountfsopts
+
+       formatall
+       setupall
+}
+run_test 104 "Make sure user defined options are reflected in mount"
+
 if ! combined_mgs_mds ; then
        stop mgs
 fi