LU-15179 tests: add trap cleanup_quota_test

Add stack_trap cleanup_quota_test to the tests that
use setup_quota_test. If a test fails without calling
cleanup_quota_test, it may cause later tests to fail
due to used space > 0.

Remove ${tdir}_dom, if exists, in cleanup_quota_test.
sanity-quota_75 doesn't remove test_dom directory.

Lustre-change: https://review.whamcloud.com/#/c/45418/
Lustre-commit: c44b2bea1bacc3cb9173353037cf3a616f13669f

Test-Parameters: trivial  testlist=sanity-quota
Fixes: a4fbe734("LU-14739 quota: nodemap squashed root cannot bypass quota")
Change-Id: Ife4fd499b427bee79f74a5e172d233fe6a83e240
Signed-off-by: Sergey Cheremencev <sergey.cheremencev@hpe.com>
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/48705
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index d95728c..f7f40d4 100755 (executable)
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -392,11 +392,13 @@ setup_quota_test() {
        # always clear fail_loc in case of fail_loc isn't cleared
        # properly when previous test failed
        lustre_fail mds_ost 0
+       stack_trap cleanup_quota_test EXIT
 }
 
 cleanup_quota_test() {
        echo "Delete files..."
        rm -rf $DIR/$tdir
+       [ -d $DIR/${tdir}_dom ] && rm -rf $DIR/${tdir}_dom
        echo "Wait for unlink objects finished..."
        wait_delete_completed
        sync_all_data || true
@@ -517,7 +519,6 @@ test_0() {
                skip "not enough space ${free_space} KB, " \
                        "required $((MB * 1024)) KB"
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        set_ost_qtype "none" || error "disable ost quota failed"
        test_quota_performance $MB
@@ -526,8 +527,6 @@ test_0() {
        $LFS setquota -u $TSTUSR -b 0 -B 10G -i 0 -I 0 $DIR ||
                error "set quota failed"
        test_quota_performance $MB
-
-       cleanup_quota_test
 }
 run_test 0 "Test basic quota performance"
 
@@ -555,6 +554,7 @@ test_1_check_write() {
        $RUNAS $DD of=$testfile count=1 seek=$limit &&
                quota_error $short_qtype $TSTUSR \
                        "user write success, but expect EDQUOT"
+       return 0
 }
 
 check_write_fallocate() {
@@ -585,7 +585,6 @@ test_1a() {
        local testfile="$DIR/$tdir/$tfile-0"
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        # enable ost quota
        set_ost_qtype $QTYPE || error "enable ost quota failed"
@@ -637,7 +636,6 @@ test_1a() {
 
        if ! is_project_quota_supported; then
                echo "Project quota is not supported"
-               cleanup_quota_test
                return 0
        fi
 
@@ -678,7 +676,6 @@ test_1b() {
 
        mds_supports_qp
        setup_quota_test || error "setup quota failed with $?"
-       stack_trap cleanup_quota_test EXIT
 
        # enable ost quota
        set_ost_qtype $QTYPE || error "enable ost quota failed"
@@ -744,7 +741,6 @@ test_1b() {
 
        if ! is_project_quota_supported; then
                echo "Project quota is not supported"
-               cleanup_quota_test
                return 0
        fi
 
@@ -787,7 +783,6 @@ test_1c() {
 
        mds_supports_qp
        setup_quota_test || error "setup quota failed with $?"
-       stack_trap cleanup_quota_test EXIT
 
        # enable ost quota
        set_ost_qtype $QTYPE || error "enable ost quota failed"
@@ -832,12 +827,8 @@ test_1c() {
        sync_all_data || true
 
        used=$(getquota -u $TSTUSR global curspace $qpool1)
-       [ $used -ne 0 ] && quota_error u $TSTUSR \
+       [ $used -eq 0 ] || quota_error u $TSTUSR \
                "user quota isn't released after deletion"
-       resetquota -u $TSTUSR
-
-       # cleanup
-       cleanup_quota_test
 }
 run_test 1c "Quota pools: check 3 pools with hardlimit only for global"
 
@@ -851,7 +842,6 @@ test_1d() {
 
        mds_supports_qp
        setup_quota_test || error "setup quota failed with $?"
-       stack_trap cleanup_quota_test EXIT
 
        # enable ost quota
        set_ost_qtype $QTYPE || error "enable ost quota failed"
@@ -894,12 +884,8 @@ test_1d() {
        sync_all_data || true
 
        used=$(getquota -u $TSTUSR global curspace $qpool1)
-       [ $used -ne 0 ] && quota_error u $TSTUSR \
+       [ $used -eq 0 ] || quota_error u $TSTUSR \
                "user quota isn't released after deletion"
-       resetquota -u $TSTUSR
-
-       # cleanup
-       cleanup_quota_test
 }
 run_test 1d "Quota pools: check block hardlimit on different pools"
 
@@ -912,7 +898,6 @@ test_1e() {
 
        mds_supports_qp
        setup_quota_test || error "setup quota failed with $?"
-       stack_trap cleanup_quota_test EXIT
 
        # enable ost quota
        set_ost_qtype $QTYPE || error "enable ost quota failed"
@@ -956,12 +941,8 @@ test_1e() {
        sync_all_data || true
 
        used=$(getquota -u $TSTUSR global curspace $qpool1)
-       [ $used -ne 0 ] && quota_error u $TSTUSR \
+       [ $used -eq 0 ] || quota_error u $TSTUSR \
                "user quota isn't released after deletion"
-       resetquota -u $TSTUSR
-
-       # cleanup
-       cleanup_quota_test
 }
 run_test 1e "Quota pools: global pool high block limit vs quota pool with small"
 
@@ -974,7 +955,6 @@ test_1f() {
 
        mds_supports_qp
        setup_quota_test || error "setup quota failed with $?"
-       stack_trap cleanup_quota_test EXIT
 
        # enable ost quota
        set_ost_qtype $QTYPE || error "enable ost quota failed"
@@ -1014,9 +994,6 @@ test_1f() {
        # became > 10M. QMT returned EINPROGRESS in a loop.
        # Check that it doesn't hung anymore.
        test_1_check_write $testfile "user" $limit1
-
-       # cleanup
-       cleanup_quota_test
 }
 run_test 1f "Quota pools: correct qunit after removing/adding OST"
 
@@ -1030,7 +1007,6 @@ test_1g() {
 
        mds_supports_qp
        setup_quota_test || error "setup quota failed with $?"
-       stack_trap cleanup_quota_test EXIT
        $LCTL set_param $mdmb_param=1
        stack_trap "$LCTL set_param $mdmb_param=$max_dirty_mb" EXIT
 
@@ -1090,7 +1066,6 @@ test_1h() {
        check_set_fallocate_or_skip
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        # enable ost quota
        set_ost_qtype $QTYPE || error "enable ost quota failed"
@@ -1113,9 +1088,8 @@ test_1h() {
        wait_delete_completed || error "wait_delete_completed failed"
        sync_all_data || true
        used=$(getquota -u $TSTUSR global curspace)
-       [ $used -ne 0 ] && quota_error u $TSTUSR \
+       [ $used -eq 0 ] || quota_error u $TSTUSR \
                "user quota isn't released after deletion"
-       resetquota -u $TSTUSR
 }
 run_test 1h "Block hard limit test using fallocate"
 
@@ -1136,7 +1110,6 @@ test_2() {
                skip "not enough free inodes $free_inodes required $limit"
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        # enable mdt quota
        set_mdt_qtype $QTYPE || error "enable mdt quota failed"
@@ -1203,7 +1176,7 @@ test_2() {
                "user quota isn't released after deletion"
 
        resetquota -g $TSTUSR
-       ! is_project_quota_supported && cleanup_quota_test &&
+       ! is_project_quota_supported &&
                echo "Skip project quota is not supported" && return 0
 
        # test for project
@@ -1248,7 +1221,6 @@ test_block_soft() {
                qmt.$FSNAME-QMT0000.dt-0x0.soft_least_qunit)
 
        setup_quota_test
-       stack_trap cleanup_quota_test EXIT
 
        $LFS setstripe $testfile -c 1 -i 0
        chown $TSTUSR.$TSTUSR $testfile
@@ -1579,7 +1551,6 @@ test_file_soft() {
                qmt.$FSNAME-QMT0000.md-0x0.soft_least_qunit)
 
        setup_quota_test
-       trap cleanup_quota_test EXIT
        is_project_quota_supported && change_project -sp $TSTPRJID $DIR/$tdir
 
        echo "Create files to exceed soft limit"
@@ -1742,7 +1713,6 @@ test_5() {
        local ILIMIT=10 # inodes
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        set_mdt_qtype $QTYPE || error "enable mdt quota failed"
        set_ost_qtype $QTYPE || error "enable ost quota failed"
@@ -1794,7 +1764,6 @@ test_5() {
        # cleanup
        unlinkmany $DIR/$tdir/$tfile-0_ $((ILIMIT + 1)) ||
                error "unlinkmany $DIR/$tdir/$tfile-0_ failed"
-       cleanup_quota_test
 }
 run_test 5 "Chown & chgrp successfully even out of block/file quota"
 
@@ -1807,7 +1776,6 @@ test_6() {
        do_facet ost1 dmesg -c > /dev/null
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        # make sure the system is clean
        local USED=$(getquota -u $TSTUSR global curspace)
@@ -1904,8 +1872,6 @@ test_6() {
                fi
                sleep 1
        done
-
-       cleanup_quota_test
 }
 run_test 6 "Test dropping acquire request on master"
 
@@ -1917,7 +1883,6 @@ test_7a() {
        [ "$SLOW" = "no" ] && LIMIT=5
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        # make sure the system is clean
        local USED=$(getquota -u $TSTUSR global curspace)
@@ -1976,8 +1941,6 @@ test_7a() {
        # hardlimit should be cleared on slave during reintegration
        $RUNAS $DD of=$TESTFILE count=$((LIMIT + 1)) oflag=sync ||
                quota_error u $TSTUSR "write error, but expect success"
-
-       cleanup_quota_test
 }
 run_test 7a "Quota reintegration (global index)"
 
@@ -1987,7 +1950,6 @@ test_7b() {
        local TESTFILE=$DIR/$tdir/$tfile
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        # make sure the system is clean
        local USED=$(getquota -u $TSTUSR global curspace)
@@ -2049,7 +2011,6 @@ test_7c() {
        [ "$SLOW" = "no" ] && LIMIT=5
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        # make sure the system is clean
        local USED=$(getquota -u $TSTUSR global curspace)
@@ -2087,8 +2048,7 @@ test_7c() {
        # reintegration, write will exceed quota
        $RUNAS $DD of=$TESTFILE count=$((LIMIT + 1)) oflag=sync &&
                quota_error u $TSTUSR "write success, but expect EDQUOT"
-
-       cleanup_quota_test
+       return 0
 }
 run_test 7c "Quota reintegration (restart mds during reintegration)"
 
@@ -2099,7 +2059,6 @@ test_7d(){
        local limit=20 # MB
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        set_ost_qtype "none" || error "disable ost quota failed"
        $LFS setquota -u $TSTUSR -B ${limit}M $DIR ||
@@ -2123,8 +2082,7 @@ test_7d(){
 
        $RUNAS2 $DD of=$TESTFILE1 count=$((limit + 1)) oflag=sync &&
                quota_error u $TSTUSR2 "$TSTUSR2 write success, expect EDQUOT"
-
-       cleanup_quota_test
+       return 0
 }
 run_test 7d "Quota reintegration (Transfer index in multiple bulks)"
 
@@ -2147,7 +2105,6 @@ test_7e() {
        local TESTFILE=$DIR/${tdir}-1/$tfile
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        # make sure the system is clean
        local USED=$(getquota -u $TSTUSR global curinodes)
@@ -2209,8 +2166,6 @@ test_7e() {
 
        $RUNAS unlinkmany $TESTFILE $((ilimit + 1)) || error "unlink failed"
        rmdir $DIR/${tdir}-1 || error "unlink remote dir failed"
-
-       cleanup_quota_test
 }
 run_test 7e "Quota reintegration (inode limits)"
 
@@ -2220,7 +2175,6 @@ test_8() {
        local FILE_LIMIT=1000000
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        set_mdt_qtype $QTYPE || error "enable mdt quota failed"
        set_ost_qtype $QTYPE || error "enable ost quota failed"
@@ -2245,7 +2199,7 @@ test_8() {
                quota_error a $TSTUSR "dbench failed!"
 
        is_project_quota_supported && change_project -C $DIR/$tdir
-       cleanup_quota_test
+       return 0
 }
 run_test 8 "Run dbench with quota enabled"
 
@@ -2270,7 +2224,6 @@ test_9() {
        check_whether_skip && return 0
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        set_ost_qtype "ug" || error "enable ost quota failed"
 
@@ -2315,7 +2268,6 @@ test_10() {
        local TESTFILE=$DIR/$tdir/$tfile
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        # set limit to root user should fail
        $LFS setquota -u root -b 100G -B 500G -i 1K -I 1M $DIR &&
@@ -2337,15 +2289,12 @@ test_10() {
 
        runas -u 0 -g 0 $DD of=$TESTFILE count=3 oflag=sync ||
                error "write failure, expect success"
-
-       cleanup_quota_test
 }
 run_test 10 "Test quota for root user"
 
 test_11() {
        local TESTFILE=$DIR/$tdir/$tfile
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        set_mdt_qtype "ug" || error "enable mdt quota failed"
        $LFS setquota -u $TSTUSR -b 0 -B 0 -i 0 -I 1 $DIR ||
@@ -2360,8 +2309,6 @@ test_11() {
        $SHOW_QUOTA_USER
        local USED=$(getquota -u $TSTUSR global curinodes)
        [ $USED -ge 2 ] || error "Used inodes($USED) is less than 2"
-
-       cleanup_quota_test
 }
 run_test 11 "Chown/chgrp ignores quota"
 
@@ -2374,7 +2321,6 @@ test_12a() {
        local TESTFILE1="$DIR/$tdir/$tfile"-1
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        set_ost_qtype "u" || error "enable ost quota failed"
        quota_show_check b u $TSTUSR
@@ -2403,8 +2349,6 @@ test_12a() {
        echo "Write to ost1 after space freed from ost0..."
        $RUNAS $DD of=$TESTFILE1 count=$blk_cnt oflag=sync ||
                quota_error a $TSTUSR "rebalancing failed"
-
-       cleanup_quota_test
 }
 run_test 12a "Block quota rebalancing"
 
@@ -2416,7 +2360,6 @@ test_12b() {
        local TESTFILE1=$DIR/${tdir}-1/$tfile
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        $LFS mkdir -i 1 $DIR/${tdir}-1 || error "create remote dir failed"
        chmod 0777 $DIR/${tdir}-1
@@ -2447,8 +2390,6 @@ test_12b() {
        $RUNAS unlinkmany $TESTFILE1 $((ilimit / 2)) ||
                error "unlink mdt1 files failed"
        rmdir $DIR/${tdir}-1 || error "unlink remote dir failed"
-
-       cleanup_quota_test
 }
 run_test 12b "Inode quota rebalancing"
 
@@ -2458,7 +2399,6 @@ test_13(){
        local procf="ldlm.namespaces.*MDT0000-lwp-OST0000.lru_size"
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        set_ost_qtype "u" || error "enable ost quota failed"
        quota_show_check b u $TSTUSR
@@ -2496,8 +2436,6 @@ test_13(){
        local space=$(getquota -u $TSTUSR $OSTUUID curspace)
        [ $limit -le $space ] ||
                error "spare quota isn't released, limit:$limit, space:$space"
-
-       cleanup_quota_test
 }
 run_test 13 "Cancel per-ID lock in the LRU list"
 
@@ -2615,7 +2553,6 @@ test_16b()
        mount_client $MOUNT || error "Unable to mount client"
 
        setup_quota_test || error "setup quota failed with $?"
-       stack_trap cleanup_quota_test EXIT
 
        $LFS setquota -u $TSTUSR -B 100M -I 10K $MOUNT ||
                error "failed to set quota for user $TSTUSR"
@@ -2638,7 +2575,6 @@ test_17sub() {
        local TESTFILE=$DIR/$tdir/$tfile
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        # make sure the system is clean
        local USED=$(getquota -u $TSTUSR global curspace)
@@ -2715,7 +2651,6 @@ test_18_sub () {
        local TESTFILE="$DIR/$tdir/$tfile"
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        set_ost_qtype "u" || error "enable ost quota failed"
        log "User quota (limit: $blimit)"
@@ -2794,7 +2729,6 @@ test_19() {
        local TESTFILE=$DIR/$tdir/$tfile
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        set_ost_qtype $QTYPE || error "enable ost quota failed"
 
@@ -2818,8 +2752,6 @@ test_19() {
        $RUNAS $DD of=$TESTFILE count=$((blimit + 1)) seek=$((blimit + 1)) &&
                quota_error u $TSTUSR "Write success, expect failure"
        $SHOW_QUOTA_USER
-
-       cleanup_quota_test
 }
 run_test 19 "Updating admin limits doesn't zero operational limits(b14790)"
 
@@ -2870,7 +2802,6 @@ test_21() {
        local ILIMIT=1000000
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        set_ost_qtype $QTYPE || error "Enable ost quota failed"
 
@@ -2934,8 +2865,6 @@ test_21() {
                sleep 1
        done
        echo "(dd_pid=$DDPID2, time=$count)successful"
-
-       cleanup_quota_test
 }
 run_test 21 "Setquota while writing & deleting (b16053)"
 
@@ -2983,7 +2912,6 @@ test_23_sub() {
        local LIMIT=$1
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        set_ost_qtype $QTYPE || error "Enable ost quota failed"
 
@@ -3046,7 +2974,6 @@ test_24() {
        local TESTFILE="$DIR/$tdir/$tfile"
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        set_ost_qtype $QTYPE || error "enable ost quota failed"
 
@@ -3065,8 +2992,6 @@ test_24() {
        sync_all_data || true
 
        $SHOW_QUOTA_USER | grep '*' || error "no matching *"
-
-       cleanup_quota_test
 }
 run_test 24 "lfs draws an asterix when limit is reached (b16646)"
 
@@ -3150,7 +3075,6 @@ test_30() {
        local GRACE=10
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        set_ost_qtype "u" || error "enable ost quota failed"
 
@@ -3174,8 +3098,6 @@ test_30() {
        $SHOW_QUOTA_USER
        $RUNAS $DD of=$TESTFILE conv=notrunc oflag=append count=4 &&
                error "grace times were reset"
-       # cleanup
-       cleanup_quota_test
        $LFS setquota -t -u --block-grace $MAX_DQ_TIME --inode-grace \
                $MAX_IQ_TIME $DIR || error "restore grace time failed"
 }
@@ -3188,7 +3110,6 @@ test_33() {
        local TOTAL_BLKS=$((INODES * BLK_CNT * 1024))
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        # make sure the system is clean
        local USED=$(getquota -u $TSTID global curspace)
@@ -3273,7 +3194,6 @@ test_34() {
 
        is_project_quota_supported && project_supported="yes"
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        # make sure the system is clean
        local USED=$(getquota -u $TSTID global curspace)
@@ -3353,8 +3273,7 @@ test_34() {
                [ $USED -lt $BLK_CNT ] && error \
                        "Used space for group $TSTPRJID is $USED, expected $BLK_CNT"
        fi
-
-       cleanup_quota_test
+       return 0
 }
 run_test 34 "Usage transfer for user & group & project"
 
@@ -3363,7 +3282,6 @@ test_35() {
        local BLK_CNT=2 # MB
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        echo "Write file..."
        $RUNAS $DD of=$DIR/$tdir/$tfile count=$BLK_CNT 2>/dev/null ||
@@ -3458,8 +3376,6 @@ test_35() {
                        error "Used space for project $TSTPRJID isn't " \
                                "increased orig:$ORIG_PRJ_SPACE, now:$USED"
        fi
-
-       cleanup_quota_test
 }
 run_test 35 "Usage is still accessible across reboot"
 
@@ -3470,7 +3386,6 @@ test_37() {
                skip "Old server doesn't have LU-5006 fix."
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        # make sure the system is clean
        local USED=$(getquota -u $TSTID global curspace)
@@ -3491,8 +3406,6 @@ test_37() {
 
        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'"
 
@@ -3504,7 +3417,6 @@ test_38() {
        [ "$UID" != 0 ] && skip_env "must run as root" && return
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        # make sure the system is clean
        local USED=$(getquota -u $TSTID global curspace)
@@ -3539,8 +3451,6 @@ test_38() {
                do_facet mds1 $LCTL get_param $procf
                error "skipped id entries"
        }
-
-       cleanup_quota_test
 }
 run_test 38 "Quota accounting iterator doesn't skip id entries"
 
@@ -3564,10 +3474,8 @@ test_39() {
        mount
        setupall
        projectid=$(lfs project $TESTFILE | awk '{print $1}')
-       [ $projectid -ne 1024 ] &&
+       [ $projectid -eq 1024 ] ||
                error "Project id should be 1024 not $projectid"
-
-       cleanup_quota_test
 }
 run_test 39 "Project ID interface works correctly"
 
@@ -3585,9 +3493,7 @@ test_40a() {
 
        ln $dir1/1 $dir2/1_link &&
                error "Hard link across different project quota should fail"
-       rm -rf $dir1 $dir2
-
-       cleanup_quota_test
+       return 0
 }
 run_test 40a "Hard link across different project ID"
 
@@ -3604,11 +3510,7 @@ test_40b() {
 
        mv $dir1/1 $dir2/2 || error "mv failed $?"
        local projid=$(lfs project $dir2/2 | awk '{print $1}')
-       if [ "$projid" != "2" ]; then
-               error "project id expected 2 not $projid"
-       fi
-       rm -rf $dir1 $dir2
-       cleanup_quota_test
+       [ "$projid" -eq 2 ] || error "project id expected 2 not $projid"
 }
 run_test 40b "Mv across different project ID"
 
@@ -3631,13 +3533,9 @@ test_40c() {
                error "file under remote dir expected 1 not $projid"
 
        #Agent inode should be ignored for project quota
-       USED=$(getquota -p 1 global curinodes)
-       [ "$USED" != "3" ] &&
-               error "file count expected 3 got $USED"
-
-       rm -rf $dir
-       cleanup_quota_test
-       return 0
+       local used=$(getquota -p 1 global curinodes)
+       [ $used -eq 3 ] ||
+               error "file count expected 3 got $used"
 }
 run_test 40c "Remote child Dir inherit project quota properly"
 
@@ -3667,12 +3565,9 @@ test_40d() {
        done
 
        # account should be 1 + (2 + 1) *10 + 1 * 5
-       USED=$(getquota -p $TSTPRJID global curinodes)
-       [ "$USED" == "36" ] ||
-               error "file count expected 36 got $USED"
-
-       rm -rf $dir
-       cleanup_quota_test
+       local used=$(getquota -p $TSTPRJID global curinodes)
+       [ $used -eq 36 ] ||
+               error "file count expected 36 got $used"
 }
 run_test 40d "Stripe Directory inherit project quota properly"
 
@@ -3680,7 +3575,6 @@ test_41() {
        is_project_quota_supported ||
                skip "Project quota is not supported"
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
        local dir="$DIR/$tdir/dir"
        local blimit=102400
        local ilimit=4096
@@ -3715,8 +3609,6 @@ test_41() {
                 awk '/$FSNAME/ { printf \\\"%d %d \\\", \\\$2,\\\$3 }'" \
                "$expected" ||
                error "failed to get correct statfs for project quota"
-
-       cleanup_quota_test
 }
 run_test 41 "df should return projid-specific values"
 
@@ -3779,8 +3671,7 @@ test_48()
        test_delete_qid "quota_slave/limit_group" "glb-grp" "-g" $TSTID
        is_project_quota_supported &&
            test_delete_qid "quota_slave/limit_project" "glb-prj" "-p" "10000"
-
-       cleanup_quota_test
+       return 0
 }
 run_test 48 "lfs quota --delete should delete quota project ID"
 
@@ -3805,10 +3696,7 @@ test_50() {
 
        # 1(projid 0 dir) + 1(projid 2 dir) + 20(projid 2 files)
        count=$($LFS find ! --projid 1 $DIR/$tdir | wc -l)
-       [ "$count" != 22 ] && error "expected 22 but got $count"
-
-       rm -rf $dir1 $dir2
-       cleanup_quota_test
+       [ $count -eq 22 ] || error "expected 22 but got $count"
 }
 run_test 50 "Test if lfs find --projid works"
 
@@ -3837,10 +3725,7 @@ test_51() {
        #try mv to dir
        mv $DIR/$tdir/6 $dir/7
        used=$(getquota -p 1 global curinodes)
-       [ $used != "6" ] && error "expected 6 got $used"
-
-       rm -rf $dir
-       cleanup_quota_test
+       [ $used -eq 6 ] || error "expected 6 got $used"
 }
 run_test 51 "Test project accounting with mv/cp"
 
@@ -3857,8 +3742,7 @@ test_52() {
                mrename $DIR/$tdir/file $dir/file >&/dev/null &&
                        error "rename should fail"
        done
-       rm -rf $dir
-       cleanup_quota_test
+       return 0
 }
 run_test 52 "Rename across different project ID"
 
@@ -3868,14 +3752,12 @@ test_53() {
        setup_quota_test || error "setup quota failed with $?"
        local dir="$DIR/$tdir/dir"
        mkdir $dir && change_project -s $dir
-       lfs project -d $dir | grep P || error "inherit attribute should be set"
+       [[ $($LFS project -d $dir) =~ " P " ]] ||
+               error "inherit attribute should be set"
 
        change_project -C $dir
-       lfs project -d $dir | grep P &&
+       [[ $($LFS project -d $dir) =~ " - " ]] ||
                error "inherit attribute should be cleared"
-
-       rm -rf $dir
-       cleanup_quota_test
 }
 run_test 53 "Project inherit attribute could be cleared"
 
@@ -3883,7 +3765,6 @@ test_54() {
        ! is_project_quota_supported &&
                skip "Project quota is not supported"
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
        local testfile="$DIR/$tdir/$tfile-0"
 
        #set project ID/inherit attribute
@@ -3928,8 +3809,6 @@ test_54() {
        #cleanup
        unlinkmany ${testfile} 100 ||
                error "unlink many files failed"
-
-       cleanup_quota_test
 }
 run_test 54 "basic lfs project interface test"
 
@@ -3971,8 +3850,6 @@ test_55() {
        error "chgrp should succeed"
 
        $LFS quota -v -g $TSTUSR2 $DIR
-
-       cleanup_quota_test
 }
 run_test 55 "Chgrp should be affected by group quota"
 
@@ -3990,8 +3867,6 @@ test_56() {
                $LFS quota -t -u $DIR
                error "expected grace time: 10s;10s, got:$grace_time"
        fi
-
-       cleanup_quota_test
 }
 run_test 56 "lfs quota -t should work well"
 
@@ -4010,8 +3885,6 @@ test_57() {
        ln -s $dir/not_exist_file $dir/ccc
        local cnt=$(lfs project -r $dir 2>/dev/null | wc -l)
        [ $cnt -eq 7 ] || error "expected 7 got $cnt"
-
-       cleanup_quota_test
 }
 run_test 57 "lfs project could tolerate errors"
 
@@ -4027,7 +3900,6 @@ test_59() {
        touch $testfile && lfs project -sp 1 $testfile
 
        enable_project_quota
-       cleanup_quota_test
 }
 run_test 59 "lfs project dosen't crash kernel with project disabled"
 
@@ -4035,7 +3907,6 @@ test_60() {
        [ $MDS1_VERSION -lt $(version_code 2.11.53) ] &&
                skip "Needs MDS version 2.11.53 or later."
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        local testfile=$DIR/$tdir/$tfile
        local limit=100
@@ -4056,8 +3927,6 @@ test_60() {
        # root user can overrun quota
        runas -u 0 -g 0 touch $DIR/$tdir/foo ||
                error "root user should succeed"
-
-       cleanup_quota_test
 }
 run_test 60 "Test quota for root with setgid"
 
@@ -4100,7 +3969,6 @@ test_default_quota() {
        }
 
        setup_quota_test || error "setup quota failed with $?"
-       stack_trap cleanup_quota_test EXIT
 
        quota_init
 
@@ -4241,7 +4109,6 @@ test_default_quota() {
                error "reset default quota failed"
        $LFS setquota $qtype $qid $qpool_cmd $qs 0 $qh 0 $DIR ||
                error "reset quota failed"
-
        cleanup_quota_test
 }
 
@@ -4275,7 +4142,7 @@ test_62() {
        chattr -P $testdir || error "root failed to clear inherit"
        [[ $($LFS project -d $testdir) =~ "P" ]] &&
                error "inherit attribute should be cleared"
-       cleanup_quota_test
+       return 0
 }
 run_test 62 "Project inherit should be only changed by root"
 
@@ -4295,7 +4162,6 @@ test_dom() {
        [ $qtype == "p" ] && qid=$TSTPRJID
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        quota_init
 
@@ -4375,13 +4241,11 @@ test_dom() {
        $RUNAS $DD of=$DIR/$tdir/file count=$((LIMIT/2048 + 10)) oflag=sync &&
                quota_error $qtype $qid "write succeed, expect EDQUOT"
 
-       rm -f $DIR/$tdir/*
+       rm -fr $DIR/$tdir
        rm -fr $DIR/$tdir_dom
 
        $LFS setquota -u $TSTUSR -b 0 -B 0 -i 0 -I 0 $DIR ||
                error "reset usr quota failed"
-
-       cleanup_quota_test
 }
 
 test_63() {
@@ -4411,7 +4275,6 @@ test_64() {
 
        used=$(getquota -p $TSTPRJID global curinodes)
        [ $used -eq 0 ] || error "expected 0 got $used"
-       cleanup_quota_test
 }
 run_test 64 "lfs project on non dir/files should succeed"
 
@@ -4434,14 +4297,10 @@ test_65() {
        local quota_g=$($LFS quota -g $TSTUSR $DIR)
        local quota_all=$($RUNAS $LFS quota $DIR)
 
-       [ "$(echo "$quota_all" | head -n3)" != "$quota_u" ] &&
+       [ "$(echo "$quota_all" | head -n3)" == "$quota_u" ] ||
                error "usr quota not match"
-       [ "$(echo "$quota_all" | tail -n3)" != "$quota_g" ] &&
+       [ "$(echo "$quota_all" | tail -n3)" == "$quota_g" ] ||
                error "grp quota not match"
-
-       rm -f $TESTFILE
-       # cleanup
-       cleanup_quota_test
 }
 run_test 65 "Check lfs quota result"
 
@@ -4451,7 +4310,6 @@ test_66() {
        [ "$MDS1_VERSION" -lt $(version_code 2.12.4) ] &&
                skip "Not supported before 2.12.4"
        setup_quota_test || error "setup quota failed with $?"
-       stack_trap cleanup_quota_test EXIT
        local old=$(do_facet mds1 $LCTL get_param -n \
                    mdt.*.enable_chprojid_gid | head -1)
        local testdir=$DIR/$tdir/foo
@@ -4486,8 +4344,6 @@ test_66() {
 
        change_project -p $TSTPRJID $testdir/bar || error \
                "root should be able to change its own file's projid"
-
-       cleanup_quota_test
 }
 run_test 66 "nonroot user can not change project state in default"
 
@@ -4544,7 +4400,6 @@ test_67() {
                skip "ZFS grants some block space together with inode"
 
        setup_quota_test || error "setup quota failed with $?"
-       trap cleanup_quota_test EXIT
 
        # enable ost quota
        set_ost_qtype $QTYPE || error "enable ost quota failed"
@@ -4644,11 +4499,8 @@ test_67() {
        wait_delete_completed || error "wait_delete_completed failed"
        sync_all_data || true
        used=$(getquota -u $TSTUSR global curspace)
-       [ $used -ne 0 ] && quota_error u $TSTUSR \
+       [ $used -eq 0 ] || quota_error u $TSTUSR \
                "user quota isn't released after deletion"
-       resetquota -u $TSTUSR
-
-       cleanup_quota_test
 }
 run_test 67 "quota pools recalculation"
 
@@ -4667,7 +4519,6 @@ test_68()
 
        mds_supports_qp
        setup_quota_test || error "setup quota failed with $?"
-       stack_trap cleanup_quota_test EXIT
 
        # enable ost quota
        set_ost_qtype $QTYPE || error "enable ost quota failed"
@@ -4705,10 +4556,8 @@ test_68()
 
        # Check again that all is fine with global pool
        nr=$(get_slave_nr "0x0" "usr")
-       [[ $nr != $((OSTCOUNT + MDSCOUNT)) ]] &&
+       [[ $nr == $((OSTCOUNT + MDSCOUNT)) ]] ||
                error "Slave_nr $nr for global pool != ($OSTCOUNT + $MDSCOUNT)"
-
-       cleanup_quota_test
 }
 run_test 68 "slave number in quota pool changed after each add/remove OST"
 
@@ -4722,7 +4571,6 @@ test_69()
 
        mds_supports_qp
        setup_quota_test || error "setup quota failed with $?"
-       stack_trap cleanup_quota_test EXIT
 
        # enable ost quota
        set_ost_qtype $QTYPE || error "enable ost quota failed"
@@ -4770,8 +4618,6 @@ test_69()
 
        $RUNAS dd if=/dev/zero of="$dom0/f1" bs=1K count=512 seek=512 \
                oflag=sync || quota_error u $TSTUSR "write failed"
-
-       cleanup_quota_test
 }
 run_test 69 "EDQUOT at one of pools shouldn't affect DOM"
 
@@ -4786,7 +4632,6 @@ test_70()
                skip "Needs a client >= $VERSION_WITH_QP"
 
        setup_quota_test || error "setup quota failed with $?"
-       stack_trap cleanup_quota_test EXIT
 
        # MDS returns EFAULT for unsupported quotactl command
        [[ $MDS1_VERSION -lt $(version_code $VERSION_WITH_QP) ]] && err=14
@@ -4810,8 +4655,6 @@ test_70()
        $LFS quota -u $TSTUSR --pool $qpool $DIR
        rc=$?
        [ $rc -eq $err ] || error "quota res $rc != $err"
-
-       cleanup_quota_test
 }
 run_test 70 "check lfs setquota/quota with a pool option"
 
@@ -4828,7 +4671,6 @@ test_71a()
        [[ $OSTCOUNT -lt 2 ]] && skip "need >= 2 OSTs"
        mds_supports_qp
        setup_quota_test || error "setup quota failed with $?"
-       stack_trap cleanup_quota_test EXIT
 
        # enable ost quota
        set_ost_qtype $QTYPE || error "enable ost quota failed"
@@ -4894,8 +4736,6 @@ test_71a()
        # write to the 1st component - OST0 is empty
        $RUNAS $DD of=$testfile count=$limit seek=0 ||
                quota_error u $TSTUSR "write failed"
-
-       cleanup_quota_test
 }
 run_test 71a "Check PFL with quota pools"
 
@@ -4913,7 +4753,6 @@ test_71b()
        [[ $OSTCOUNT -lt 2 ]] && skip "need >= 2 OSTs" && return
        mds_supports_qp
        setup_quota_test || error "setup quota failed with $?"
-       stack_trap cleanup_quota_test EXIT
 
        # enable ost quota
        set_ost_qtype $QTYPE || error "enable ost quota failed"
@@ -4961,8 +4800,7 @@ test_71b()
        # write over limit in qpool2
        $RUNAS $DD of=$testfile count=2 seek=$((128 + limit2)) &&
                quota_error u $TSTUSR "user write success, but expect EDQUOT"
-
-       cleanup_quota_test
+       return 0
 }
 run_test 71b "Check SEL with quota pools"
 
@@ -4975,7 +4813,6 @@ test_72()
 
        mds_supports_qp
        setup_quota_test || error "setup quota failed with $?"
-       stack_trap cleanup_quota_test EXIT
 
        # enable ost quota
        set_ost_qtype $QTYPE || error "enable ost quota failed"
@@ -5008,8 +4845,7 @@ test_72()
        # was added in a pool
        lfs quota -v -u $TSTUSR --pool $qpool $DIR | grep -v "OST0001" |
                grep "OST\|MDT" && error "$qpool consists wrong targets"
-
-       cleanup_quota_test
+       return 0
 }
 run_test 72 "lfs quota --pool prints only pool's OSTs"
 
@@ -5036,7 +4872,6 @@ test_73b()
        mds_supports_qp
 
        setup_quota_test || error "setup quota failed with $?"
-       stack_trap cleanup_quota_test EXIT
        quota_init
        set_ost_qtype $QTYPE || error "enable ost quota failed"
 
@@ -5082,9 +4917,6 @@ function cleanup_quota_test_75()
        wait_nm_sync active
 
        resetquota -u $TSTUSR
-
-       rm -rf $DIR/${tdir}_dom
-       cleanup_quota_test
 }
 
 test_dom_75() {
@@ -5257,8 +5089,7 @@ test_76() {
        touch $testfile
        $LFS project -p 4294967295 $testfile &&
                error "set project ID should fail"
-
-       cleanup_quota_test
+       return 0
 }
 run_test 76 "project ID 4294967295 should be not allowed"