Branch HEAD

b=20047
i=robert.read
i=yong.fan

reset debug level if lustre was already mounted

diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh
index 512bfe6..4dfecee 100755 (executable)
--- a/lustre/tests/replay-ost-single.sh
+++ b/lustre/tests/replay-ost-single.sh
@@ -2,7 +2,6 @@
 
 set -e
 
-PTLDEBUG=${PTLDEBUG:--1}
 LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
 SETUP=${SETUP:-""}
 CLEANUP=${CLEANUP:-""}

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index ecb9b2c..31311bd 100644 (file)
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -63,11 +63,6 @@ QUOTALOG=${TESTSUITELOG:-$TMP/$(basename $0 .sh).log}
 DIR=${DIR:-$MOUNT}
 DIR2=${DIR2:-$MOUNT2}
 
-if [ ! -z "$(mounted_lustre_filesystems)" ]; then
-        log "set debug level as $PTLDEBUG"
-        do_nodes $(comma_list $(nodes_list)) "lctl set_param debug=$PTLDEBUG"
-fi
-
 check_and_setup_lustre
 
 if [ x"$(som_check)" = x"enabled" ]; then
@@ -2111,7 +2106,7 @@ run_test_with_stat 28 "test for consistency for qunit when setquota (18574) ====
 quota_fini()
 {
        $LFS quotaoff $DIR
-        do_nodes $(comma_list $(nodes_list)) "lctl set_param debug=+quota"
+    do_nodes $(comma_list $(nodes_list)) "lctl set_param debug=-quota"
 }
 quota_fini
 

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 1620014..c9435e7 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -1812,6 +1812,11 @@ check_and_setup_lustre() {
         check_config $MOUNT
         init_facets_vars
         init_param_vars
+
+        do_nodes $(comma_list $(nodes_list)) "lctl set_param debug=\\\"$PTLDEBUG\\\";
+            lctl set_param subsystem_debug=\\\"${SUBSYSTEM# }\\\";
+            lctl set_param debug_mb=${DEBUG_SIZE};
+            sync"
     fi
     if [ "$ONLY" == "setup" ]; then
         exit 0