LU-4306 test: bump grace time in test_4a of s-q

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

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index 634d7f9..2b16a2b 100644 (file)
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -50,12 +50,9 @@ if [ $(facet_fstype $SINGLEMDS) == ldiskfs ] &&
        skip "e2fsprogs doesn't support quota" && exit 0
 fi
 
-# bug number for skipped test: LU-4515
-ALWAYS_EXCEPT="$ALWAYS_EXCEPT  34"
-
 if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then
-# bug number for skipped test:        LU-2872 LU-2836 LU-2836 LU-2059
-       ALWAYS_EXCEPT="$ALWAYS_EXCEPT 1       3       6       7d"
+# bug number for skipped test:        LU-2836 LU-2836 LU-2059
+       ALWAYS_EXCEPT="$ALWAYS_EXCEPT 3       6       7d"
 # bug number:     LU-2887
        ZFS_SLOW="12a"
 fi
@@ -141,7 +138,7 @@ quota_scan() {
        fi
 
        if [ "$LOCAL_UG" == "a" -o "$LOCAL_UG" == "g" ]; then
-               $LFS quota -v -u $LOCAL_ID $DIR
+               $LFS quota -v -g $LOCAL_ID $DIR
                log "Files for group ($LOCAL_ID):"
                ($LFS find -group $LOCAL_ID $DIR | head -n 4 |
                        xargs stat 2>/dev/null)
@@ -739,7 +736,7 @@ test_file_soft() {
 test_4a() {
        local LIMIT=10 # inodes
        local TESTFILE=$DIR/$tdir/$tfile-0
-       local GRACE=5
+       local GRACE=12
 
        set_mdt_qtype "ug" || error "enable mdt quota failed"
 
@@ -2144,6 +2141,9 @@ test_34() {
        USED=$(getquota -g $TSTID global curspace)
        [ $USED -ne 0 ] && error "Used space ($USED) for group $TSTID isn't 0."
 
+       local USED=$(getquota -u $TSTID2 global curspace)
+       [ $USED -ne 0 ] && error "Used space ($USED) for user $TSTID2 isn't 0."
+
        echo "Write file..."
        $DD of=$DIR/$tdir/$tfile count=$BLK_CNT 2>/dev/null ||
                error "write failed"
@@ -2180,6 +2180,24 @@ test_34() {
        [ $USED -eq 1 ] ||
                error "Used inodes for group $TSTID is $USED, expected 1"
 
+       # chown won't change the ost object group. LU-4345 */
+       echo "chown the file to user $TSTID2"
+       chown $TSTID2 $DIR/$tdir/$tfile || error "chown to $TSTID2 failed"
+
+       echo "Wait for setattr on objects finished..."
+       wait_delete_completed
+
+       echo "Verify disk usage for user $TSTID2/$TSTID and group $TSTID"
+       USED=$(getquota -u $TSTID2 global curspace)
+       [ $USED -lt $BLK_CNT ] &&
+               error "Used space for user $TSTID2 is $USED, expected $BLK_CNT"
+       USED=$(getquota -u $TSTID global curspace)
+       [ $USED -ne 0 ] &&
+               error "Used space for user $TSTID is $USED, expected 0"
+       USED=$(getquota -g $TSTID global curspace)
+       [ $USED -lt $BLK_CNT ] &&
+               error "Used space for group $TSTID is $USED, expected $BLK_CNT"
+
        cleanup_quota_test
 }
 run_test 34 "Usage transfer for user & group"
@@ -2331,6 +2349,36 @@ test_36() {
 }
 run_test 36 "Migrate old admin files into new global indexes"
 
+# chown/chgrp to the file created with MDS_OPEN_DELAY_CREATE
+# LU-5006
+test_37() {
+       setup_quota_test
+       trap cleanup_quota_test EXIT
+
+       # make sure the system is clean
+       local USED=$(getquota -u $TSTID global curspace)
+       [ $USED -ne 0 ] &&
+               error "Used space ($USED) for user $TSTID isn't 0."
+
+       # create file with MDS_OPEN_DELAY_CREATE flag
+       $LFS setstripe -c 1 -i 0 $DIR/$tdir/$tfile ||
+               error "Create file failed"
+       # write to file
+       dd if=/dev/zero of=$DIR/$tdir/$tfile bs=1M count=1 conv=notrunc \
+               oflag=sync || error "Write file failed"
+       # chown to the file
+       chown $TSTID $DIR/$tdir/$tfile || error "Chown to file failed"
+
+       # wait for setattr on objects finished..."
+       wait_delete_completed
+
+       USED=$(getquota -u $TSTID global curspace)
+       [ $USED -ne 0 ] || quota_error u $TSTUSR "Used space is 0"
+
+       cleanup_quota_test
+}
+run_test 37 "Quota accounted properly for file created by 'lfs setstripe'"
+
 quota_fini()
 {
         do_nodes $(comma_list $(nodes_list)) "lctl set_param debug=-quota"