X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre-iokit%2Fsgpdd-survey%2Fsgpdd-survey;h=b5c1f015ebdcfe55030a8e4e33329f6e377aded5;hb=d0a54de6fc931066fd5cf18c78d2eba597e09942;hp=135a87efd49f140b00b6a9ac94c4d6e1747b0ad2;hpb=d5adc37bad1944c73080048a9a157780282a1227;p=fs%2Flustre-release.git

diff --git a/lustre-iokit/sgpdd-survey/sgpdd-survey b/lustre-iokit/sgpdd-survey/sgpdd-survey
index 135a87e..b5c1f01 100755
--- a/lustre-iokit/sgpdd-survey/sgpdd-survey
+++ b/lustre-iokit/sgpdd-survey/sgpdd-survey
@@ -3,8 +3,11 @@
 ######################################################################
 # customize per survey
 
-# the SCSI devices to measure
-scsidevs=${scsidevs:-"/dev/sde /dev/sdh"}
+# CHOOSE EITHER scsidevs or rawdevs
+# the SCSI devices to measure - WARNING: will be erased.
+# The raw devices to use
+# 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
@@ -41,14 +44,39 @@ SG_MAX_QUEUE=16
 # map given device names into SG device names
 i=0
 devs=()
-for d in $scsidevs; do
-    devs[$i]=`sg_map | awk "{if ($ 2 == \"$d\") print $ 1}"`
-    if [ -z "${devs[$i]}" ]; then
-	echo "Can't find SG device for $d"
-	exit 1
-    fi
-    i=$((i+1))
-done
+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
+	devs[$i]=`sg_map | awk "{if ($ 2 == \"$d\") print $ 1}"`
+        if [ -z "${devs[i]}" ]; then
+            echo "Can't find SG device for $d, testing for partition"
+            pt=`echo $d | sed 's/[0-9]$//'`
+            # Try again
+            devs[$i]=`sg_map | awk "{if ($ 2 == \"$pt\") print $ 1}"`
+            if [ -z "${devs[i]}" ]; then
+                echo "Can't find SG device $pt"
+                exit 1
+           fi
+	fi
+	i=$((i+1))
+    done
+elif [ "$rawdevs" ]; then
+    for r in $rawdevs; do
+	RES=`raw -q $r`
+	if [ $? -eq 0 ];then
+	    devs[$i]=$r
+	    i=$((i+1))
+	else
+	    echo "Raw device $r not set up"
+	    exit 1
+	fi
+    done
+else
+    echo "Must specify scsidevs or rawdevs"
+    exit 1
+fi
+
 ndevs=${#devs[@]}
 
 rsltf=${rslt}.summary