Branch b1_6

b=14398
i=johann
i=bobijam

Console messages can now be disabled via lnet.printk.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 54d5f11..00c2a43 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -198,6 +198,11 @@ Details    : In obd setup failure handler, obd_stopping will not necessarily to
             be 1, and obd_set_up should also be checked to make sure whether
             obd is completely setup.
 
+Severity   : enhancement
+Bugzilla   : 14398
+Description: Allow masking D_WARNING, D_ERROR messages from console
+Details    : Console messages can now be disabled via lnet.printk.
+
 --------------------------------------------------------------------------------
 
 2007-12-07         Cluster File Systems, Inc. <info@clusterfs.com>

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index ef4a78e..6cd1902 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -2567,6 +2567,26 @@ test_60c() {
 }
 run_test 60c "unlink file when mds full"
 
+test_60d() {
+       SAVEPRINTK=$(sysctl -n lnet.printk)
+
+       # verify "lctl mark" is even working"
+       MESSAGE="test message ID $RANDOM $$"
+       $LCTL mark "$MESSAGE" || error "$LCTL mark failed"
+       dmesg | grep -q "$MESSAGE" || error "didn't find debug marker in log"
+
+       sysctl -w lnet.printk=0 || error "set lnet.printk failed"
+       sysctl -n lnet.printk | grep emerg || error "lnet.printk dropped emerg"
+
+       MESSAGE="new test message ID $RANDOM $$"
+       # Assume here that libcfs_debug_mark_buffer() uses D_WARNING
+       $LCTL mark "$MESSAGE" || error "$LCTL mark failed"
+       dmesg | grep -q "$MESSAGE" && error "D_WARNING wasn't masked" || true
+
+       sysctl -w lnet.printk="$SAVEPRINTK"
+}
+run_test 60d "test printk console message masking"
+
 test_61() {
        f="$DIR/f61"
        dd if=/dev/zero of=$f bs=`page_size` count=1