LU-2284 tests: clear limits before testing

The quota limits left over from other tests which has quota enabled
could confuse the sanity-quota, so we'd clear all the before testing.

Signed-off-by: Niu Yawei <niu@whamcloud.com>
Change-Id: Ie24e6891d920a0c7fa6ffc29ee8ff9400b8636af
Reviewed-on: http://review.whamcloud.com/4766
Reviewed-by: Johann Lombardi <johann.lombardi@intel.com>
Tested-by: Hudson
Reviewed-by: Fan Yong <yong.fan@whamcloud.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index f524b9f..cb90532 100644 (file)
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -346,6 +346,11 @@ quota_init() {
 }
 quota_init
 
+resetquota -u $TSTUSR
+resetquota -g $TSTUSR
+resetquota -u $TSTUSR2
+resetquota -g $TSTUSR2
+
 test_quota_performance() {
        local TESTFILE="$DIR/$tdir/$tfile-0"
        local size=$1 # in MB
@@ -1117,13 +1122,10 @@ test_7d(){
        trap cleanup_quota_test EXIT
 
        set_ost_qtype "none" || error "disable ost quota failed"
-       # LU-2284. Enable trace for debug log.
-       do_nodes $(comma_list $(nodes_list)) "lctl set_param debug=+trace"
        $LFS setquota -u $TSTUSR -B ${limit}M $DIR ||
                error "set quota for $TSTUSR failed"
        $LFS setquota -u $TSTUSR2 -B ${limit}M $DIR ||
                error "set quota for $TSTUSR2 failed"
-       do_nodes $(comma_list $(nodes_list)) "lctl set_param debug=-trace"
 
        #define OBD_FAIL_OBD_IDX_READ_BREAK 0x608
        lustre_fail mds 0x608 0