From 01e1bdcec4af985791b40e1fbfaa77a2d5427fce Mon Sep 17 00:00:00 2001
From: Elena Gryaznova <elena.gryaznova@oracle.com>
Date: Mon, 14 Feb 2011 20:25:35 +0300
Subject: [PATCH] b=19944 adjust debug size to be -gt num_possible_cpus()

a=Landen <zhiyong.tian@oracle.com>
i=Elena.Gryaznova
---
 lnet/libcfs/tracefile.c        |  6 +++-
 lustre/tests/test-framework.sh | 64 +++++++++++++++++++++++++++++-------------
 2 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/lnet/libcfs/tracefile.c b/lnet/libcfs/tracefile.c
index b5123cb..81b2da1 100644
--- a/lnet/libcfs/tracefile.c
+++ b/lnet/libcfs/tracefile.c
@@ -894,8 +894,12 @@ int trace_set_debug_mb(int mb)
         int limit = trace_max_debug_mb();
         struct trace_cpu_data *tcd;
 
-        if (mb < num_possible_cpus())
+        if (mb < num_possible_cpus()) {
+                printk(KERN_ERR "Cannot set debug_mb to %d, "
+                       "the value should be >= %d\n",
+                       mb, num_possible_cpus());
                 return -EINVAL;
+        }
 
         if (mb > limit) {
                 printk(KERN_ERR "Lustre: Refusing to set debug buffer size to "
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 932b07e..b5c0bf5 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -392,6 +392,47 @@ unload_modules() {
     return 0
 }
 
+set_debug_size () {
+    local dz=${1:-$DEBUG_SIZE}
+    local cpus=$(getconf _NPROCESSORS_CONF)
+
+    # bug 19944, adjust size to be -gt num_possible_cpus()
+    # promise 2MB for every cpu at least
+    if [ -n "$cpus" ] && [ $((cpus * 2)) -gt $dz ]; then
+        dz=$((cpus * 2))
+    fi
+    lctl set_param debug_mb=$dz
+}
+
+set_default_debug () {
+    lctl set_param debug=$PTLDEBUG
+    lctl set_param subsystem_debug=${SUBSYSTEM# }
+
+    set_debug_size $DEBUG_SIZE
+    sync
+}
+
+remote_node () {
+    local node=$1
+    [ "$node" != "$(hostname)" ]
+}
+
+set_default_debug_nodes () {
+    local nodes=$1
+
+    if remote_node $nodes; then
+	do_rpc_nodes $nodes set_default_debug
+    else
+	set_default_debug
+    fi
+}
+
+set_default_debug_facet () {
+    local facet=$1
+
+    set_default_debug_nodes $(facet_host ${facet})
+}
+
 # Facet functions
 mount_facets () {
     local facets=${1:-$(get_facets)}
@@ -416,10 +457,7 @@ mount_facet() {
         echo "mount -t lustre $@ ${!dev} $mntpt"
         echo "Start of ${!dev} on ${facet} failed ${RC}"
     else
-        do_facet ${facet} "lctl set_param debug=\\\"$PTLDEBUG\\\"; \
-            lctl set_param subsystem_debug=\\\"${SUBSYSTEM# }\\\"; \
-            lctl set_param debug_mb=${DEBUG_SIZE}; \
-            sync"
+        set_default_debug_facet $facet
 
         label=$(do_facet ${facet} "$E2LABEL ${!dev}")
         [ -z "$label" ] && echo no label for ${!dev} && exit 1
@@ -588,9 +626,7 @@ zconf_mount() {
     echo "Starting client: $client: $OPTIONS $device $mnt"
     do_node $client mkdir -p $mnt
     do_node $client mount -t lustre $OPTIONS $device $mnt || return 1
-    do_node $client "lctl set_param debug=\\\"$PTLDEBUG\\\";
-        lctl set_param subsystem_debug=\\\"${SUBSYSTEM# }\\\";
-        lctl set_param debug_mb=${DEBUG_SIZE}"
+    set_default_debug_nodes $client
 
     return 0
 }
@@ -707,9 +743,7 @@ exit $rc"
     echo "Started clients $clients: "
     do_nodes $clients "mount | grep -w $mnt"
 
-    do_nodes $clients "sysctl -w lnet.debug=\\\"$PTLDEBUG\\\";
-        sysctl -w lnet.subsystem_debug=\\\"${SUBSYSTEM# }\\\";
-        sysctl -w lnet.debug_mb=${DEBUG_SIZE};"
+    set_default_debug_nodes $clients
 
     return 0
 }
@@ -2093,10 +2127,7 @@ check_and_setup_lustre() {
         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"
+        set_default_debug_nodes $(comma_list $(nodes_list))
     fi
     if [ "$ONLY" == "setup" ]; then
         exit 0
@@ -2862,11 +2893,6 @@ ostuuid_from_index()
     $LFS osts $2 | awk '/^'$1'/ { print $2 }'
 }
 
-remote_node () {
-    local node=$1
-    [ "$node" != "$(hostname)" ]
-}
-
 remote_mds ()
 {
     remote_node $mds_HOST
-- 
1.8.3.1