b=10958

[fs/lustre-release.git] / lustre-iokit / sgpdd-survey / sgpdd-survey

diff --git a/lustre-iokit/sgpdd-survey/sgpdd-survey b/lustre-iokit/sgpdd-survey/sgpdd-survey
index 100d456..2b6c419 100755 (executable)
--- a/lustre-iokit/sgpdd-survey/sgpdd-survey
+++ b/lustre-iokit/sgpdd-survey/sgpdd-survey
@@ -5,10 +5,9 @@
 
 # CHOOSE EITHER scsidevs or rawdevs
 # the SCSI devices to measure - WARNING: will be erased.
-#scsidevs="/dev/sde /dev/sdh"
 # The raw devices to use
-#rawdevs="/dev/raw/raw1"
-#scsidevs=`ls /dev/sd[a-z] /dev/sd[a-z][a-z]` # all devices, if you use udev
+# rawdevs=${rawdevs:-"/dev/raw/raw1"}
+# scsidevs=`ls /dev/sd[a-z] /dev/sd[a-z][a-z]` # all devices, if you use udev
 
 # result file prefix.  date/time+hostname makes unique
 # NB ensure the path exists if it includes subdirs
@@ -19,7 +18,7 @@ actions="write read"
 
 # total size per device (MBytes)
 # NB bigger than device cache is good
-size=8192
+size=${size:-8192}
 
 # record size (KBytes)
 rszlo=1024
@@ -30,6 +29,7 @@ crglo=${crglo:-1}
 crghi=${crghi:-256}
 
 # threads to share between concurrent regions per device
+# multiple threads per region simulates a deeper request queue
 # NB survey skips over #thr < #regions and #thr/#regions > SG_MAX_QUEUE
 thrlo=${thrlo:-1}
 thrhi=${thrhi:-4096}
@@ -45,7 +45,7 @@ SG_MAX_QUEUE=16
 # map given device names into SG device names
 i=0
 devs=()
-if [ $scsidevs ]; then
+if [ "$scsidevs" ]; then
         # we will test for a LUN, the test for a partition
         # if the partition number is > 9 this will fail
     for d in $scsidevs; do
@@ -62,7 +62,7 @@ if [ $scsidevs ]; then
        fi
        i=$((i+1))
     done
-elif [ $rawdevs ]; then
+elif [ "$rawdevs" ]; then
     for r in $rawdevs; do
        RES=`raw -q $r`
        if [ $? -eq 0 ];then
@@ -95,6 +95,15 @@ print_summary () {
     echo $minusn "$*"
 }
 
+time_v=`date`
+hostname=`hostname`
+if [ "$rawdevs" ]; then
+       print_summary "$time_v sgpdd-survey on $rawdevs from $hostname"
+fi
+if [ "$scsidevs" ]; then
+       print_summary "$time_v sgpdd-survey on $scsidevs from $hostname"
+fi
+
 for ((rsz=$rszlo;rsz<=$rszhi;rsz*=2)); do
     for ((crg=$crglo;crg<=$crghi;crg*=2)); do 
        for ((thr=$thrlo;thr<=$thrhi;thr*=2)); do