From 29e709dca64d0c475420a4ea8635acebfc901d74 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra>
Date: Fri, 21 Sep 2007 07:39:56 +0000
Subject: [PATCH 1/1] b:11171, 10961 i:nathan, cliffw - removed OSTS and
 ECHO_CLIENTS command line options, instead   used only 'targets' option for
 all three cases. - modified README-obdfilter-survey as per changes in 11171.

---
 lustre-iokit/ChangeLog                             |   5 +
 .../obdfilter-survey/README.obdfilter-survey       |  25 +--
 lustre-iokit/obdfilter-survey/libecho              | 105 ++++++++----
 lustre-iokit/obdfilter-survey/obdfilter-survey     | 176 ++++++++++-----------
 4 files changed, 169 insertions(+), 142 deletions(-)

diff --git a/lustre-iokit/ChangeLog b/lustre-iokit/ChangeLog
index 1b77092..69e48fb 100644
--- a/lustre-iokit/ChangeLog
+++ b/lustre-iokit/ChangeLog
@@ -15,3 +15,8 @@
 	Aditions for bug: 11171
 	- Added automatic ondecho module load support on client and server
 	- Added flexible OSS setup and cleanup
+2007-09-21 Jitendra Pawar <jitendra@clusterfs.com>
+	Aditions for bug: 11171, 10961
+	- removed OSTS and ECHO_CLIENTS command line options, instead 
+	  used only 'targets' option for all three cases. 
+	- modified README-obdfilter-survey as per changes in 11171. 
diff --git a/lustre-iokit/obdfilter-survey/README.obdfilter-survey b/lustre-iokit/obdfilter-survey/README.obdfilter-survey
index 051e0aa..e483a6a 100644
--- a/lustre-iokit/obdfilter-survey/README.obdfilter-survey
+++ b/lustre-iokit/obdfilter-survey/README.obdfilter-survey
@@ -31,7 +31,7 @@ components.
    of echo_client running on 1 or more nodes.
 
    You just need to pass parameters case=network and 
-   server_nid="<name/nid_of_server>" to the script. The script will do the 
+   targets="<hostname/ip_of_server>" to the script. The script will do the 
    required setup for network case. 
    
 3. The Stripe F/S over the Network.
@@ -53,8 +53,10 @@ Running
 -------
 
 The script must be customised according to the components under test and
-where it should keep its working files.  Customization variables are
-described clearly at Customization variables Section  in the script.
+where it should keep its working files. Customization variables are
+described clearly at Customization variables Section in the script.
+Please see maximum suported value ranges for customization variables
+in the srcipt.
 
 To run against a local disk:
 ---------------------------
@@ -89,14 +91,13 @@ oss02:   0 UP obdfilter oss02-sdi oss02-sdi_UUID 3
 Here the obdfilter instance names are oss01-sdb, oss01-sdd, oss02-sdi.
 
 Since you are driving obdfilter instances directly, set the shell array
-variable 'ost_names' to the names of the obdfilter instances and leave
-'ECHO_CLIENTS' undefined.
+variable 'targets' to the names of the obdfilter instances. 
+
 Example:
 
-OSTS='oss01:oss01-sdb oss01:oss01-sdd oss02:oss02-sdi' \
+targets='oss01:oss01-sdb oss01:oss01-sdd oss02:oss02-sdi' \
    ./obdfilter-survey
 
-
 To run against a network:
 ------------------------
 For the second case i.e. obdfilter-survey over network, following setup
@@ -107,14 +108,14 @@ is to be done.
   and server machine to avoid typing password. 
 1. Automated run:
    To run obdfilter-surevy against network you just need to pass parameter 
-   case=netdisk and server_nid="<name/nid_of_server>" to the script.
+   case=netdisk and targets="<hostname/ip_of_server>" to the script.
  
-e.g. $ nobjhi=2 thrhi=2 size=1024 server_nid="<name/nid_of_server>" \
+e.g. $ nobjhi=2 thrhi=2 size=1024 targets="<hostname/ip_of_server>" \
        case=network sh obdfilter-survey
 
 On server side you can see the stats at : 
-        /proc/fs/lustre/obdecho/<ost-testfs>/ststs
-where, 'ost_testfs' is the obdecho server created through script.
+        /proc/fs/lustre/obdecho/<echo_srv>/stats
+where, 'echo_srv' is the obdecho server created through script.
 
 NOTE: In network test only automated run is supported.
 
@@ -130,7 +131,7 @@ e.g. : $ nobjhi=2 thrhi=2 size=1024 case=netdisk sh obdfilter-survey
 2. Manual run:
 While running manually you need to tell the script all the names of the
 echo_client instances, which should already be up and running.
-e.g. $ nobjhi=2 thrhi=2 size=1024 ECHO_CLIENTS="ECHO_<osc_name> ..." \
+e.g. $ nobjhi=2 thrhi=2 size=1024 targets="<osc_name> ..." \
        sh obdfilter-survey
 
 
diff --git a/lustre-iokit/obdfilter-survey/libecho b/lustre-iokit/obdfilter-survey/libecho
index 9bca4b8..860d547 100644
--- a/lustre-iokit/obdfilter-survey/libecho
+++ b/lustre-iokit/obdfilter-survey/libecho
@@ -22,6 +22,7 @@ insmod="/sbin/insmod"
 rmmod="/sbin/rmmod"
 
 declare -a ost_names
+declare -a client_names
 declare -a host_list
 declare -a dev_list
 declare -a unique_hosts
@@ -155,10 +156,44 @@ get_devnos () {
     return 0
 }
 
+# do cleanup for netdisk case.
+cleanup_netdisk () {
+    for osc in $@; do
+        lctl <<EOF
+        cfg_device $osc 
+        cleanup
+        detach
+EOF
+    done
+}
+
+# do cleanup for network case.
+cleanup_network () {
+    local clean_srv_OSS=$1
+    lctl <<EOF
+    cfg_device echotmp 
+    cleanup
+    detach
+EOF
+    remote_shell "root@$server_nid" "lctl << EOF
+        cfg_device echo_srv
+        cleanup
+        detach
+EOF"
+    if [ $clean_srv_OSS ]; then
+        remote_shell "root@$server_nid" "lctl << EOF
+            cfg_device OSS
+            cleanup
+            detach
+EOF"
+    fi
+}
+
 # do cleanup and exit.
 cleanup () {
-    local clean_srv_OSS=$2
-    for ((i = 0; i < ndevs; i++)); do
+    local exit_status=$1
+    shift
+    for ((i = 0; i < $ndevs; i++)); do
     	host=${host_names[$i]}
 	    if [ -n ${do_teardown_ec[$i]} ]; then
         	teardown_ec_devno $host ${client_names[$i]}
@@ -177,26 +212,14 @@ cleanup () {
         fi
     done
     if [ $case == "network" ]; then
-        lctl <<EOF
-        cfg_device osc_testfs
-        cleanup
-        detach
-EOF
-        remote_shell "root@$server_nid" "lctl << EOF
-            cfg_device echo_srv
-            cleanup
-            detach
-EOF"
+        cleanup_network $1 
     fi
-    if [ $clean_srv_OSS ]; then
-        remote_shell "root@$server_nid" "lctl << EOF
-            cfg_device OSS
-            cleanup
-            detach
-EOF"
+    if [ $case == "netdisk" ]; then
+	shift
+        cleanup_netdisk $@
     fi
-    if [ $1 ]; then
-        if [ $1 -ne 0 ]; then
+    if [ $exit_status ]; then
+        if [ $exit_status -ne 0 ]; then
             echo "program exited with error "
         else
             echo "done!"
@@ -204,7 +227,7 @@ EOF"
     else
         echo "Terminated"
     fi
-    exit $1
+    exit $exit_status
 }
 trap cleanup SIGHUP SIGINT SIGTERM
 
@@ -222,7 +245,7 @@ get_ec_devno () {
 	    echo "client and ost name both null" 1>&2
 	    return
 	fi
-	client_name=${ost_name}_echo_client
+        client_name=${ost_name}_ecc
     fi
     ec=`get_devno $host echo_client $client_name`
     if [ -n "$ec" ]; then
@@ -238,13 +261,14 @@ get_ec_devno () {
 	echo "OST $ost_name not setup" 1>&2
 	return
     fi
+    client_name=${ost_name}_ecc
     remote_shell $host "$lctl <<EOF
         attach echo_client $client_name ${client_name}_UUID
 	setup $ost_name
 EOF"
     ec=`get_devno $host echo_client $client_name`
     if [ -z "$ec" ]; then
-	echo "Can't setup echo client" 1>&2
+	echo "Can't setup echo-client" 1>&2
 	return
     fi
     echo $ec $client_name 1
@@ -254,10 +278,9 @@ EOF"
 # It creates echoclients for all osc listed using #lctl device_list command
 ec_using_osc () {
     local osc_name=$1
-    local osc_uuid=$2
     $lctl <<EOF
-        attach echo_client ECHO_$osc_name $osc_uuid
-        cfg_device ECHO_$osc_name
+        attach echo_client ${osc_name}_ecc ${osc_name}_ecc_UUID
+        cfg_device ${osc_name}_ecc
         setup $osc_name
 EOF
 
@@ -268,18 +291,30 @@ ec_using_srv_nid () {
     local server_nid=$1
     local ocsname=$2
     local oscuuid=$3
-    $lctl add_uuid testfs_UUID $server_nid@tcp >/dev/null 2>&1
+    $lctl add_uuid echo_UUID $server_nid@tcp >/dev/null 2>&1
     $lctl <<EOF
         attach osc $ocsname $oscuuid
         cfg_device $ocsname
-        setup echo_srv_UUID testfs_UUID
+        setup echo_srv_UUID echo_UUID
 EOF
     $lctl <<EOF
-        attach echo_client ECHO_$ocsname $oscuuid
+        attach echo_client ${ocsname}_ecc $oscuuid
         setup $ocsname 
 EOF
 }
 
+setup_osc_for_remote_ost () {
+    local ost_nid=$1
+    local obdfilter_name=$2
+    local host_name=host_$3
+    $lctl add_uuid ${host_name}_UUID $ost_nid@tcp >/dev/null 2>&1
+    $lctl <<EOF
+        attach osc ${obdfilter_name}_osc ${obdfilter_name}_osc_UUID
+        cfg_device ${obdfilter_name}_osc 
+        setup ${obdfilter_name}_UUID ${host_name}_UUID
+EOF
+}
+
 # setup obdecho on server
 setup_srv_obd () {
     local server_nid=$1
@@ -363,16 +398,18 @@ check_setup () {
 # added from bugzill req.
 get_targets () {
     if [ -z "$ost_names" ]; then
-        OSTS=$($lctl device_list | awk "{if (\$2 == \"UP\" && \
+        targets=$($lctl device_list | awk "{if (\$2 == \"UP\" && \
             \$3 == \"obdfilter\") {print \$4} }")
     fi
-    if [ -z "$OSTS" ]; then
-        echo "Can't find any OSTs to test.  Please set ost_names=..."
+    if [ -z "$targets" ]; then
+        echo "Can't find any OSTs to test.  Please set targets=..."
         exit 1
     fi
     count=0
-    for name in $OSTS; do
+    for name in $targets; do
         ost_names[$count]=$name
+        str=(`split_hostname $name`)
+        host_names[$count]=${str[0]}
         count=$((count+1))
     done
 }
@@ -380,7 +417,7 @@ get_targets () {
 get_hosts () {
     # split out hostnames from ost names
     for ((i = 0; i < count; i++)); do
-        str=(`split_hostname ${OSTS[$i]}`)
+        str=(`split_hostname ${targets[$i]}`)
         host_list[$i]=${str[0]}
         ost_names[$i]=${str[1]}
     done
diff --git a/lustre-iokit/obdfilter-survey/obdfilter-survey b/lustre-iokit/obdfilter-survey/obdfilter-survey
index fd8407d..9e8eb33 100755
--- a/lustre-iokit/obdfilter-survey/obdfilter-survey
+++ b/lustre-iokit/obdfilter-survey/obdfilter-survey
@@ -22,16 +22,16 @@
 # How to run test:
 # case 1 (local disk):
 #   $ nobjhi=2 thrhi=2 size=1024 case=disk sh obdfilter-survey
-#   instead of case=disk one can also run test as follows
-#   $ nobjhi=2 thrhi=2 size=1024 OSTS="lustre-OST0000 lustre-OST0001 ..." sh obdfilter-survey
+#   one can also run test with user defined targets as follows,
+#   $ nobjhi=2 thrhi=2 size=1024 targets="lustre-OST0000 lustre-OST0001 ..." sh obdfilter-survey
 # case 2 (network):
-#   $ nobjhi=2 thrhi=2 size=1024 server_nid="<name/nid_of_server>" case=network sh obdfilter-survey
-#   where, server_nid is name or ip address of system, which you want to 
+#   $ nobjhi=2 thrhi=2 size=1024 targets="<name/ip_of_server>" case=network sh obdfilter-survey
+#   where, targets is name or ip address of system, which you want to 
 #   set as server.
 # case 3 (network and disk):
 #   $ nobjhi=2 thrhi=2 size=1024 case=netdisk sh obdfilter-survey
-#   instead of case="netdisk" one can also run test as follows
-#   $ nobjhi=2 thrhi=2 size=1024 ECHO_CLIENTS="ECHO_<osc_name> ..." sh obdfilter-survey
+#   one can also run test with user defined targets as follows,
+#   $ nobjhi=2 thrhi=2 size=1024 targets="<osc_name> ..." sh obdfilter-survey
 #[ NOTE: It is advised to have automated login (passwordless entry) between server and 
 #  client systems on which this test runs.]
 
@@ -53,7 +53,7 @@ verify=${verify:-0}
 # and to make test startup/shutdown overhead insignificant
 size=${size:-16384}
 
-# record size (KBytes)
+# record size (KBytes) ( 7168 max)
 rszlo=${rszlo:-1024}
 rszhi=${rszhi:-1024}
 
@@ -180,30 +180,22 @@ print_summary () {
 #####################################################################
 # One can change variable values in this section as per requirements
 
-OSTS=${OSTS:-""}
-server_nid=${server_nid:-""}
+targets=${targets:-""}
 case=${case:-"disk"}
-if [ -n "$OSTS" ]; then
+if [ -n "$targets" ]; then
     declare -a ost_names
-    count=0
-    for name in $OSTS; do
-        ost_names[$count]=$name
-        count=$((count+1))
-    done
-fi
-ECHO_CLIENTS=${ECHO_CLIENTS:-""}
-if [ -n "$ECHO_CLIENTS" ]; then
-    # make sure we unset ost_names so that our client_names get noticed... 
-    unset ost_names
     declare -a client_names
     count=0
-    for name in $ECHO_CLIENTS; do
-        client_names[$count]=$name
+    for name in $targets; do
+        if [ $case == "disk" ]; then
+            ost_names[$count]=$name
+        else
+            client_names[$count]=$name
+        fi
         count=$((count+1))
     done
 fi
 
-
 # what tests to run (first must be write)
 tests_str=${tests_str:-""}
 if [ -n "$tests_str" ]; then
@@ -215,7 +207,8 @@ if [ -n "$tests_str" ]; then
     done
 else
     #tests=(write rewrite read reread rewrite_again)
-    tests=(write rewrite read)
+    #tests=(write rewrite read)
+    tests=(write)
 fi
 
 # restart from here iff all are defined
@@ -235,7 +228,7 @@ PAGE_SIZE=${PAGE_SIZE:-4}
 # (to avoid lctl ENOMEM problems)
 max_buffer_mem=$((1024 * 1024))
 snap=1
-
+clean_srv_OSS=0
 # Customisation variables ends here. 
 #####################################################################
 # leave the rest of this alone unless you know what you're doing...
@@ -268,9 +261,53 @@ else
     lctl=${lustre_root}/utils/lctl
 fi
 
+# split out hostnames from client/ost names
+ndevs=0
+for trgt in $targets; do
+    str=(`split_hostname $trgt`)
+    host_names[$ndevs]=${str[0]}
+    client_names[$ndevs]=${str[1]}
+    ndevs=$((ndevs+1))
+done
+if [ $case == "netdisk" ]; then
+    if [ "$targets" ]; then
+        for ((i = 0; i < $ndevs; i++)); do
+             setup_osc_for_remote_ost ${host_names[$i]} ${client_names[$i]} $i
+	     cleanup_oscs="$cleanup_oscs ${client_names[$i]}_osc"
+	     host_names[$i]=localhost
+        done
+    fi
+        declare -a osc_names
+        declare -a osc_uuids
+        osc_names_str=$(lctl dl |grep osc | awk "{if (\$2 == \"UP\" && \$3 == \"osc\") {print \$4} }")
+        count=0;
+        for name in $osc_names_str; do
+            osc_names[$count]=$name
+            count=$((count+1))
+        done
+        osc_uuid_str=$(lctl dl |grep osc | awk "{if (\$2 == \"UP\" && \$3 == \"osc\") {print \$5} }")
+        count=0;
+        for uuid in $osc_uuid_str; do
+            osc_uuids[$count]=$uuid
+            count=$((count+1))
+        done
+        for (( i = 0; i < $count; i++ ))
+        do
+            ec_using_osc ${osc_names[$i]}
+        done
+        echo_clients=$(lctl dl | grep echo_client | awk "{if (\$2 == \"UP\" && \$3 == \"echo_client\") {print \$4} }")
+        cnt=0;
+        for name in $echo_clients; do
+            client_names[$cnt]=$name
+            host_names[$cnt]=localhost
+            cnt=$((cnt+1))
+        done
+        ndevs=${#client_names[@]}
+fi
 if [ $case == "network" ]; then
+    server_nid=$targets
     if [ -z "$server_nid" ]; then
-	echo "Specify the server NID"
+	echo "Specify hostname or ip-address of server"
 	exit 1;
     fi
     # check for obdecho module on server
@@ -279,8 +316,8 @@ if [ $case == "network" ]; then
     fi
     # Now do the server setup
     setup_srv_obd $server_nid "echo_srv"
-    oss_on_srv=`dsh $server_nid root "lctl dl | grep OSS | awk '{ print $4 }'"`
-    if [ ! $oss_on_srv ]; then
+    oss_on_srv=`dsh $server_nid root "lctl dl | grep OSS" | awk '{ print $4 }'`
+    if [ -z $oss_on_srv ]; then
         setup_OSS $server_nid
         clean_srv_OSS=1
     fi
@@ -298,71 +335,15 @@ if [ $case == "network" ]; then
         echo "The existing setup must be cleaned";
         exit 0;
     fi
-    ec_using_srv_nid $server_nid "osc_testfs" "test_obdfs"
-    declare -a client_names
-    client_names[0]="ECHO_osc_testfs"
+    ec_using_srv_nid $server_nid "echotmp" "echotmp_UUID"
+    client_names[0]="echotmp_ecc"
 fi
-
-if [ -z "$ECHO_CLIENTS" ]; then
-    if [ $case == "netdisk" ]; then
-        declare -a osc_names
-        declare -a osc_uuids
-        osc_names_str=$(lctl dl |grep osc | awk "{if (\$2 == \"UP\" && \$3 == \"osc\") {print \$4} }")
-        count=0;
-        for name in $osc_names_str; do
-            osc_names[$count]=$name
-            count=$((count+1))
-        done
-        osc_uuid_str=$(lctl dl |grep osc | awk "{if (\$2 == \"UP\" && \$3 == \"osc\") {print \$5} }")
-        count=0;
-        for uuid in $osc_uuid_str; do
-            osc_uuids[$count]=$uuid
-            count=$((count+1))
-        done
-        for ((  i = 0 ;  i < $count;  i++  ))
-        do
-            ec_using_osc ${osc_names[$i]} ${osc_uuids[$i]}
-        done
-        ECHO_CLIENTS=$(lctl dl | grep echo_client | awk "{if (\$2 == \"UP\" && \$3 == \"echo_client\") {print \$4} }")
-        cnt=0;
-        for name in $ECHO_CLIENTS; do
-            client_names[$cnt]=$name
-            cnt=$((cnt+1))
-        done
-    fi
-fi
-
-if [ -z "$OSTS" ]; then
+if [ -z "$targets" ]; then
     if [ $case == "disk" ]; then
-	get_targets	
+	get_targets
+        ndevs=${#ost_names[@]}	
     fi	
 fi
-
-# split out hostnames from client/ost names
-ndevs=${#client_names[@]}
-if ((ndevs != 0)); then
-    if ((${#ost_names[@]} != 0)); then
-        echo "Please specify client_names or ost_names, but not both" 1>&2
-	exit 1
-    fi
-    for ((i = 0; i < ndevs; i++)); do
-	str=(`split_hostname ${client_names[$i]}`)
-	host_names[$i]=${str[0]}
-	client_names[$i]=${str[1]}
-    done
-else
-    ndevs=${#ost_names[@]}
-    if ((ndevs == 0)); then
-        echo "Please specify either client_names or ost_names" 1>&2
-	exit 1
-    fi
-    for ((i = 0; i < ndevs; i++)); do
-	str=(`split_hostname ${ost_names[$i]}`)
-	host_names[$i]=${str[0]}
-	ost_names[$i]=${str[1]}
-    done
-fi
-
 # get vmstat started
 # disable portals debug and get obdecho loaded on all relevant hosts
 unique_hosts=(`unique ${host_names[@]}`)
@@ -386,9 +367,8 @@ for host in ${unique_hosts[@]}; do
     echo "Can't load obdecho on $host" 1>&2
     exit 1
 done
-
 # get all the echo_client device numbers and names
-for ((i=0; i < ndevs; i++)); do
+for ((i=0; i < $ndevs; i++)); do
     host=${host_names[$i]}
     devno=(`get_ec_devno $host "${client_names[$i]}" "${ost_names[$i]}"`)
     if ((${#devno[@]} != 3)); then
@@ -398,6 +378,10 @@ for ((i=0; i < ndevs; i++)); do
     client_names[$i]=${devno[1]}
     do_teardown_ec[$i]=${devno[2]}
 done
+if (($ndevs <= 0 || ${#host_names[@]} <= 0)); then
+    echo "no devices or hosts specified"
+    cleanup 0 $clean_srv_OSS $cleanup_oscs
+fi
 print_summary "$(date) Obdfilter-survey for case=$case from $(hostname)"
 for ((rsz = $rszlo; rsz <= $rszhi; rsz*=2)); do
     for ((nobj = $nobjlo; nobj <= $nobjhi; nobj*=2)); do 
@@ -436,7 +420,7 @@ for ((rsz = $rszlo; rsz <= $rszhi; rsz*=2)); do
 	    fi
 	    # create the objects
 	    tmpf="${workf}_tmp"
-	    for ((idx = 0; idx < ndevs; idx++)); do
+	    for ((idx = 0; idx < $ndevs; idx++)); do
 		host=${host_names[$idx]}
 		devno=${devnos[$idx]}
 		client_name="${host}:${client_names[$idx]}"
@@ -461,7 +445,7 @@ for ((rsz = $rszlo; rsz <= $rszhi; rsz*=2)); do
 		for host in ${unique_hosts[@]}; do
 		    echo -n > ${cmdsf}_${host}
 		done
-		for ((idx = 0; idx < ndevs; idx++)); do
+		for ((idx = 0; idx < $ndevs; idx++)); do
 		    host=${host_names[$idx]}
 		    devno=${devnos[$idx]}
 		    tmpfi="${tmpf}_$idx"
@@ -503,7 +487,7 @@ for ((rsz = $rszlo; rsz <= $rszhi; rsz*=2)); do
 		print_summary -n "$str"
 		# collect/check individual OST stats
 		echo -n > $tmpf
-		for ((idx = 0; idx < ndevs; idx++)); do
+		for ((idx = 0; idx < $ndevs; idx++)); do
 		    client_name="${host_names[$idx]}:${client_names[$idx]}"
 		    tmpfi="${tmpf}_$idx"
 		    echo "=============> $test $client_name" >> $workf
@@ -532,7 +516,7 @@ for ((rsz = $rszlo; rsz <= $rszhi; rsz*=2)); do
 	    done
 	    print_summary ""
 	    # destroy objects we created
-	    for ((idx = 0; idx < ndevs; idx++)); do
+	    for ((idx = 0; idx < $ndevs; idx++)); do
 		host=${host_names[$idx]}
 		devno=${devnos[$idx]}
 		client_name="${host}:${client_names[$idx]}"
@@ -545,5 +529,5 @@ for ((rsz = $rszlo; rsz <= $rszhi; rsz*=2)); do
 	done
     done
 done
-cleanup 0 $clean_srv_OSS
+cleanup 0 $clean_srv_OSS $cleanup_oscs
 exit 0
-- 
1.8.3.1