From c1c331f718d4698b71e05df02892f9ef1286dd09 Mon Sep 17 00:00:00 2001
From: eeb <eeb>
Date: Mon, 11 Oct 2004 11:25:30 +0000
Subject: [PATCH] *   more cleanups

---
 lustre-iokit/ior-survey/ior-survey             | 84 ++++++++++++++------------
 lustre-iokit/obdfilter-survey/obdfilter-survey | 56 ++++++++++++-----
 lustre-iokit/sgpdd-survey/sgpdd-survey         | 21 ++++---
 3 files changed, 96 insertions(+), 65 deletions(-)

diff --git a/lustre-iokit/ior-survey/ior-survey b/lustre-iokit/ior-survey/ior-survey
index 28e91ef..b7c7421 100644
--- a/lustre-iokit/ior-survey/ior-survey
+++ b/lustre-iokit/ior-survey/ior-survey
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# cluster name (expect all node names to be this followed by a number)
+# cluster name (all node names are this followed by the node number)
 cluster=mdev
 
 # client node numbers (individual numbers or inclusive ranges)
@@ -13,8 +13,8 @@ clients_iterator="+=1"
 
 # numbers of tasks per client to survey
 tasks_per_client_lo=1
-tasks_per_client_hi=16
-tasks_per_client_iterator="*=4"
+tasks_per_client_hi=8
+tasks_per_client_iterator="*=2"
 
 # record sizes to survey
 rsize_lo=1M
@@ -26,23 +26,23 @@ rsize_iterator="*=2"
 # *write*)   write
 # *)         read
 #tests=(write rewrite read reread rewrite_again)
-tests=(write rewrite remount read)
+tests=(write rewrite remount read reread)
 
 # total # bytes written/read by any client node
-min_per_client_size=75M
-min_total_size=100M
+min_per_client_size=4G
+min_total_size=8G
 
 # should each task do I/O to its own file?
 file_per_task=1
 
-# the IOR binary
+# the binaries
 IOR="/home/ericb/ior/src/C/IOR"
-
-# the pdsh binary
+llmount=/home/ericb/lustre/utils/llmount
 pdsh=pdsh
 
-# the llmount binary
-llmount=/home/ericb/lustre/utils/llmount
+# the result file prefix (date/time + hostname makes unique)
+#rslt=/home/ericb/ior_survey_`date +%F@%R`_`uname -n`
+rslt=/home/ericb/ior_survey
 
 # where lustre is mounted on the clients
 lustre=/mnt/lustre
@@ -51,17 +51,19 @@ lustre=/mnt/lustre
 testfile=${lustre}/ior_survey_testfile
 
 # how to unmount and remount the F/S on a client (to clear the cache)
+# change this depending on lustre config (network type, MDS etc)
 remount="umount $lustre && $llmount -o nettype=elan mdev6:/ll_mds/client $lustre"
 
-# the result file prefix (date/time + hostname makes unique)
-#rslt=/home/ericb/ior_survey_`date +%F@%R`_`uname -n`
-rslt=/home/ericb/ior_survey
+# pdsh args required to instantiate all instances of IOR in parallel
+# the chosen module must support '-n <procs-per-node>'
+# -R<module>, -f<fanout> etc
+pdsh_mpiargs="-Rmqsh"
 
 #don't spin for MPI completions
 export LIBELAN_WAITTYPE=0
 
 ################################################################################
-# dont change stuff below here
+# dont change stuff below here unless you know what you're doing...
 
 count_range() {
     echo $1 | awk '{ nvals=split($1, vals, "-");\
@@ -74,9 +76,9 @@ base_range() {
 }
 
 idx2nodenum() {
-    n=$1; shift
+    local n=$1; shift
     while ((1)); do
-	range=$1; shift
+	local range=$1; shift
 	if [ -z "$range" ]; then
 	    return
 	fi
@@ -91,18 +93,18 @@ idx2nodenum() {
 }
 
 n2noderange() {
-    n=$1; shift
+    local n=$1; shift
     sep=""
     nodes="["
     while ((n > 0)); do
-	range=$1; shift
+	local range=$1; shift
 	if [ -z "$range" ]; then
             return
 	fi
-	base=`base_range $range`
-	chunk=`count_range $range`
+	local base=`base_range $range`
+	local chunk=`count_range $range`
 	if ((chunk > n)); then chunk=n; fi
-	nodes="${nodes}${sep}${base}"; sep=","
+	local nodes="${nodes}${sep}${base}"; sep=","
 	if ((chunk > 1)); then nodes="${nodes}-$((base+chunk-1))"; fi
 	n=$((n-chunk))
     done
@@ -110,10 +112,10 @@ n2noderange() {
 }
 
 countnodes() {
-    radix=16384
-    n=0
+    local radix=16384
+    local n=0
     while ((radix > 0)); do
-	nodes=`n2noderange $((n+radix)) $@`
+	local nodes=`n2noderange $((n+radix)) $@`
 	if [ -n "$nodes" ]; then
 	    n=$((n+radix))
         fi
@@ -123,7 +125,7 @@ countnodes() {
 }
 
 parse_number() {
-    str=$1
+    local str=$1
     case $str in
 	*G|*g) n=`echo $str | sed 's/[gG]//'`; echo $((n*1024*1024*1024));;
 	*M|*m) n=`echo $str | sed 's/[Mm]//'`; echo $((n*1024*1024));;
@@ -133,10 +135,10 @@ parse_number() {
 }
 
 pp_number() {
-    n=$1
-    G=$((1024*1024*1024))
-    M=$((1024*1024))
-    K=$((1024))
+    local n=$1
+    local G=$((1024*1024*1024))
+    local M=$((1024*1024))
+    local K=$((1024))
     if ((n%G == 0 && n >= G)); then
 	echo "$((n/G))G"
     elif ((n%M == 0 && n >= M)); then
@@ -154,10 +156,7 @@ if [ ${#tests[@]} -eq 0 -o "${tests[0]}" != "write" ]; then
 fi
 
 rsltf="${rslt}.summary"
-iorcf="${rslt}.script"
 workf="${rslt}.detail"
-tmpf="${workf}_tmp"
-
 echo -n > $rsltf
 echo -n > $workf
 
@@ -171,14 +170,15 @@ print_summary () {
     echo $minusn "$*"
 }
 
+# convert params to actual numbers
 min_per_client_size=`parse_number $min_per_client_size`
 min_total_size=`parse_number $min_total_size`
 
 rsize_lo=`parse_number $rsize_lo`
 rsize_hi=`parse_number $rsize_hi`
 
+# check on actual numbers of client nodes
 nclients=`countnodes ${clients[@]}`
-
 if ((clients_hi > nclients)); then clients_hi=$nclients; fi
 
 for ((rsize=rsize_lo; rsize<=rsize_hi; rsize$rsize_iterator)); do
@@ -191,12 +191,16 @@ for ((rsize=rsize_lo; rsize<=rsize_hi; rsize$rsize_iterator)); do
 	if ((per_client_size < min_per_client_size)); then
 	    per_client_size=$min_per_client_size
 	fi
-	total_size=`pp_number $((per_client_size * nclnt))`
 
 	for ((ntask=tasks_per_client_lo; ntask <= tasks_per_client_hi; ntask$tasks_per_client_iterator)); do
 	    per_task_size=$((per_client_size/ntask))
+	    if ((per_task_size%rsize != 0)); then
+		per_task_size=$(((per_task_size/rsize + 1)*rsize))
+	    fi
+	    total_size=`pp_number $((per_task_size*nclnt*ntask))`
 	    
-	    hdrstr=`printf "Total: %5sB rsize: %4s clients: %4d tasks: %3d: " $total_size $rsize $nclnt $ntask`
+	    hdrstr=`printf "Total: %5sB rsize: %4sB clients: %4d tasks: %3d: " \
+		$total_size $pp_rsize $nclnt $ntask`
 	    print_summary -n "$hdrstr"
 
 	    for ((test_idx=0; test_idx < ${#tests[@]}; test_idx++)); do
@@ -204,6 +208,7 @@ for ((rsize=rsize_lo; rsize<=rsize_hi; rsize$rsize_iterator)); do
 		
 		print_summary -n "$test "
 		echo "===========> ${hdrstr} on $test_clients doing $test" >> $workf
+		tmpf=${workf}_tmp
 		echo -n > $tmpf
 
 		if [ "$test" = "remount" ]; then
@@ -219,13 +224,13 @@ for ((rsize=rsize_lo; rsize<=rsize_hi; rsize$rsize_iterator)); do
 			result="OK"
 		    fi
 		else
+		    # check lustre is mounted everywhere it's needed
 		    cmd="(mount -t lustre; mount -t lustre_lite) | grep $lustre"
-		    echo "=> $cmd" >> $tmpf
+		    echo "=> Mount Check: $cmd" >> $tmpf
 		    $pdsh -S -b -w "$test_clients" >> $tmpf 2>&1 \
 			"$cmd"
 		    status=$?
 		    echo "Completion Status: $status" >> $tmpf
-
 		    if ((status)); then
 			cat $tmpf >> $workf
 			rm $tmpf
@@ -262,7 +267,7 @@ for ((rsize=rsize_lo; rsize<=rsize_hi; rsize$rsize_iterator)); do
 
 		    echo "=> ${cmdline[@]}" >> $tmpf
 	
-		    $pdsh -S -b -Rmqsh -w "$test_clients" -n $ntask >> $tmpf 2>&1 \
+		    $pdsh -S -b $pdsh_mpiargs -w "$test_clients" -n $ntask >> $tmpf 2>&1 \
 			"${cmdline[@]}"
 		    status=$?
 
@@ -287,4 +292,3 @@ for ((rsize=rsize_lo; rsize<=rsize_hi; rsize$rsize_iterator)); do
     done
 done
 
-# rm $iorcf
diff --git a/lustre-iokit/obdfilter-survey/obdfilter-survey b/lustre-iokit/obdfilter-survey/obdfilter-survey
index 06c26e8..7de3a0c 100755
--- a/lustre-iokit/obdfilter-survey/obdfilter-survey
+++ b/lustre-iokit/obdfilter-survey/obdfilter-survey
@@ -3,26 +3,30 @@
 ######################################################################
 # customize per survey
 
-# specify obd names (host:name if remote)
-# these can either be the echo_client names (client_names)
-# or the ost names (ost_names)
+# specify obd instances to exercise
+# these can be either...
+# obdfilter instances (set 'ost_names')
+# ...or...
+# echo_client instances (set 'client_names')
+# ... use 'host:name' for obd instances on other nodes.
+ost_names=(ost{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16})
 #client_names=(ns8:ECHO_ns8 ns9:ECHO_ns9)
-ost_names=(ns9:ost{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16})
 
 # result file prefix (date/time + hostname makes unique)
+# NB ensure path to it exists
 rslt=/home_nfs/eeb/obdfilter_survey_`date +%F@%R`_`uname -n`
 
 # lustre root (if running with own source tree)
 lustre_root=/home_nfs/eeb/lustre
 
-# what to do (we always do an initial write)
-#tests="rewrite read reread rewrite_again"
-tests="rewrite read"
+# what tests to run (first must be write)
+#tests=(write rewrite read reread rewrite_again)
+tests=(write rewrite read)
 
-# total size (MBytes) per OST
+# total size (MBytes) per obd instance
 # large enough to avoid cache effects 
 # and to make test startup/shutdown overhead insignificant
-size=8192
+size=16384
 
 # record size (KBytes)
 rszlo=1024
@@ -49,6 +53,8 @@ PAGE_SIZE=64
 max_buffer_mem=$((1024*1024))
 
 # how to run commands on other nodes
+# You need to make this work on your cluster if you have specified
+# non-local obd instances above
 custom_remote_shell () {
     host=$1
     shift
@@ -65,17 +71,25 @@ custom_remote_shell () {
 #####################################################################
 # leave the rest of this alone unless you know what you're doing...
 
+# binaries
 lsmod="/sbin/lsmod"
 modprobe="/sbin/modprobe"
 insmod="/sbin/insmod"
 rmmod="/sbin/rmmod"
 
+# lctl::test_brw bandwidth snapshot interval (seconds)
 snap=1
+# check file contents?
 verify=1
 
+if [ ${#tests[@]} -eq 0 -o "${tests[0]}" != "write" ]; then
+    echo "First test must be 'write'" 1>&2
+    exit 1
+fi
+
 rsltf="${rslt}.summary"
-cmdsf="${rslt}.script"
 workf="${rslt}.detail"
+cmdsf="${rslt}.script"
 echo -n > $rsltf
 echo -n > $workf
 
@@ -96,7 +110,7 @@ remote_shell () {
     fi
 }
 
-check_obdecho() {
+obdecho_loaded() {
     local host=$1
     remote_shell $host $lsmod | grep obdecho > /dev/null 2>&1
 }
@@ -256,7 +270,7 @@ unique () {
 }
 
 split_hostname () {
-    name=$1
+    local name=$1
     case $name in
     *:*) host=`echo $name | sed 's/:.*$//'`
 	 name=`echo $name | sed 's/[^:]*://'`
@@ -267,6 +281,7 @@ split_hostname () {
     echo "$host $name"
 }
 
+# split out hostnames from client/ost names
 ndevs=${#client_names[@]}
 if ((ndevs != 0)); then
     if ((${#ost_names[@]} != 0)); then
@@ -291,16 +306,16 @@ else
     done
 fi
 
+# disable portals debug and get obdecho loaded on all relevant hosts
 unique_hosts=(`unique ${host_names[@]}`)
-
 for host in ${unique_hosts[@]}; do
     remote_shell $host "echo 0 > /proc/sys/portals/debug"
     do_unload_obdecho[$host]=0
-    if check_obdecho $host; then
+    if obdecho_loaded $host; then
 	continue
     fi
     load_obdecho $host
-    if check_obdecho $host; then
+    if obdecho_loaded $host; then
 	do_unload_obdecho[$host]=1
 	continue
     fi
@@ -308,6 +323,7 @@ for host in ${unique_hosts[@]}; do
     exit 1
 done
 
+# get all the echo_client device numbers and names
 for ((i=0; i<ndevs; i++)); do
     host=${host_names[$i]}
     devno=(`get_ec_devno $host "${client_names[$i]}" "${ost_names[$i]}"`)
@@ -370,8 +386,10 @@ for ((rsz=$rszlo;rsz<=$rszhi;rsz*=2)); do
 		fi
 		first_objs[$idx]=$first_obj
 	    done
+	    # run tests
 	    for test in write $tests; do
 		print_summary -n "$test "
+		# create per-host script files
 		for host in ${unique_hosts[@]}; do
 		    echo -n > ${cmdsf}_${host}
 		done
@@ -388,18 +406,22 @@ for ((rsz=$rszlo;rsz<=$rszhi;rsz*=2)); do
 		for host in ${unique_hosts[@]}; do
 		    echo "wait" >> ${cmdsf}_${host}
 		done
+		# timed run of all the per-host script files
 		t0=`date +%s.%N`
 		for host in ${unique_hosts[@]}; do
 		    remote_shell $host bash ${cmdsf}_${host}&
 		done
 		wait
 		t1=`date +%s.%N`
+		# clean up per-host script files
 		for host in ${unique_hosts[@]}; do
 		    rm ${cmdsf}_${host}
 		done
+		# compute bandwidth from total data / elapsed time
 		str=`awk "BEGIN {printf \"%7.2f \",\
 		         $total_size / (( $t1 - $t0 ) * 1024)}"`
 		print_summary -n "$str"
+		# collect/check individual OST stats
 		echo -n > $tmpf
 		for ((idx=0; idx < ndevs; idx++)); do
 		    client_name="${host_names[$idx]}:${client_names[$idx]}"
@@ -409,6 +431,7 @@ for ((rsz=$rszlo;rsz<=$rszhi;rsz*=2)); do
 		    get_stats $tmpfi >> $tmpf
 		    rm $tmpfi
 		done
+		# compute/display global min/max stats
 		echo "=============> $test global" >> $workf
 		cat $tmpf >> $workf
 		stats=(`get_global_stats $tmpf`)
@@ -427,6 +450,7 @@ for ((rsz=$rszlo;rsz<=$rszhi;rsz*=2)); do
 		print_summary -n "$str"
 	    done
 	    print_summary ""
+	    # destroy objects we created
 	    for ((idx=0; idx < ndevs; idx++)); do
 		host=${host_names[$idx]}
 		devno=${devnos[$idx]}
@@ -441,6 +465,7 @@ for ((rsz=$rszlo;rsz<=$rszhi;rsz*=2)); do
     done
 done
 
+# tear down any echo clients we created
 for ((i=0; i<ndevs; i++)); do
     host=${host_names[$i]}
     if ((${do_teardown_ec[$i]})); then
@@ -448,6 +473,7 @@ for ((i=0; i<ndevs; i++)); do
     fi
 done
 
+# unload any obdecho modules we loaded
 for host in ${unique_hosts[@]}; do
     if ((${do_unload_obdecho[$host]})); then
 	unload_obdecho $host
diff --git a/lustre-iokit/sgpdd-survey/sgpdd-survey b/lustre-iokit/sgpdd-survey/sgpdd-survey
index 75dcc65..52207f1 100755
--- a/lustre-iokit/sgpdd-survey/sgpdd-survey
+++ b/lustre-iokit/sgpdd-survey/sgpdd-survey
@@ -6,9 +6,9 @@
 # the SCSI devices to measure
 scsidevs="/dev/sde /dev/sdh"
 
-# result file prefix
+# result file prefix.  date/time+hostname makes unique
 # NB ensure the path exists if it includes subdirs
-rslt=/tmp/sg_dd_rslt
+rslt=/tmp/sgpdd_survey_`date +%F@%R`_`uname -n`
 
 # what to do (read or write)
 actions="write read"
@@ -31,13 +31,14 @@ thrlo=1
 thrhi=4096
 
 #####################################################################
+# leave the rest of this alone unless you know what you're doing...
 
-# disk block size (Bytes)
+# sgp_dd's idea of disk sector size (Bytes)
 bs=512
-
-# max # threads per individual sgp_dd instance
+# and max # threads one instance will spawn
 SG_MAX_QUEUE=16
 
+# map given device names into SG device names
 i=0
 devs=()
 for d in $scsidevs; do
@@ -50,12 +51,10 @@ for d in $scsidevs; do
 done
 ndevs=${#devs[@]}
 
-start=`date +%F@%R`
-rsltf=${rslt}_${start}.summary
+rsltf=${rslt}.summary
+workf=${rslt}.detail
 echo -n > $rsltf
-workf=${rslt}_${start}.detail
 echo -n > $workf
-tmpf=${rslt}_${start}.tmp
 
 print_summary () {
     if [ "$1" = "-n" ]; then
@@ -89,9 +88,11 @@ for ((rsz=$rszlo;rsz<=$rszhi;rsz*=2)); do
 		print_summary "ENOMEM"
 		continue
 	    fi
+	    # run tests
 	    for action in $actions; do
 		print_summary -n "$action "
 		echo "=====> $action" >> $workf
+		tmpf=${workf}_tmp
                 # start test
 		t0=`date +%s.%N`
 		for ((i=0;i<ndevs;i++)); do
@@ -113,7 +114,7 @@ for ((rsz=$rszlo;rsz<=$rszhi;rsz*=2)); do
 		done 
 		wait
 		t1=`date +%s.%N`
-	        # collect all results in 1 file
+	        # collect/check individual stats
 		echo > $tmpf
 		ok=0
 		for ((i=0;i<ndevs;i++)); do
-- 
1.8.3.1