From: Yu Jian Date: Tue, 24 May 2011 08:51:03 +0000 (+0800) Subject: LU-196 set debug_mb size for every node X-Git-Tag: 2.0.66.0~20 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=d5fe82b3000578cff0af3d293a7ffda8d6de9b46;hp=4702805d15ef8ada5b4b2dd7e46b4746f005745b LU-196 set debug_mb size for every node commit 01e1bdcec4af985791b40e1fbfaa77a2d5427fce Date: Mon Feb 14 20:25:35 2011 +0300 b=19944 adjust debug size to be -gt num_possible_cpus() a=Landen i=Elena.Gryaznova Change-Id: Idc8c3d2db243c5ddd0ba95ef1be4680c4af9c411 Signed-off-by: YangSheng Signed-off-by: Yu Jian Reviewed-on: http://review.whamcloud.com/407 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Oleg Drokin --- diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 95d5a17..40912c3 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -577,6 +577,50 @@ ostdevlabel() { echo -n $label } +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 () { + local debug=${1:-"$PTLDEBUG"} + local subsystem_debug=${2:-"$SUBSYSTEM"} + local debug_size=${3:-$DEBUG_SIZE} + + lctl set_param debug="$debug" + lctl set_param subsystem_debug="${subsystem_debug# }" + + set_debug_size $debug_size + sync +} + +set_default_debug_nodes () { + local nodes=$1 + + if [[ ,$nodes, = *,$HOSTNAME,* ]]; then + nodes=$(exclude_items_from_list "$nodes" "$HOSTNAME") + set_default_debug + fi + + [[ -n $nodes ]] && do_rpc_nodes $nodes set_default_debug \ + \\\"$PTLDEBUG\\\" \\\"$SUBSYSTEM\\\" $DEBUG_SIZE || true +} + +set_default_debug_facet () { + local facet=$1 + local node=$(facet_active_host $facet) + [ -z "$node" ] && echo "No host defined for facet $facet" && exit 1 + + set_default_debug_nodes $node +} + # Facet functions mount_facets () { local facets=${1:-$(get_facets)} @@ -601,10 +645,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 @@ -757,9 +798,7 @@ zconf_mount() { 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 } @@ -876,9 +915,7 @@ exit \\\$rc" || return ${PIPESTATUS[0]} echo "Started clients $clients: " do_nodes $clients "mount | grep -w $mnt" - do_nodes $clients "lctl set_param debug=\\\"$PTLDEBUG\\\"; - lctl set_param subsystem_debug=\\\"${SUBSYSTEM# }\\\"; - lctl set_param debug_mb=${DEBUG_SIZE};" + set_default_debug_nodes $clients return 0 } @@ -2387,10 +2424,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 init_gss