From 83f0df939215953846a36f92fe279371d091210b Mon Sep 17 00:00:00 2001
From: cliffw <cliffw>
Date: Tue, 24 Jul 2007 19:13:27 +0000
Subject: [PATCH] b=12741 b=11485 i=scjody i=johann         11485 -
 sgpdd_survey uses readcap for block size         12741 - better error
 checking for sgpdd_survey

---
 lustre-iokit/ChangeLog                 |  5 +++++
 lustre-iokit/sgpdd-survey/sgpdd-survey | 13 ++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lustre-iokit/ChangeLog b/lustre-iokit/ChangeLog
index 86f6596..132861d 100644
--- a/lustre-iokit/ChangeLog
+++ b/lustre-iokit/ChangeLog
@@ -1 +1,6 @@
 2006-10-31 - Borrowing mjmac's most excellent work and setting up autogen/RPM
+2007-07-24 - 
+	Bugs committed:
+	10851 - minor obdfilter fixes
+	11485 - sgpdd_survey uses readcap for block size
+	12741 - better error checking for sgpdd_survey
diff --git a/lustre-iokit/sgpdd-survey/sgpdd-survey b/lustre-iokit/sgpdd-survey/sgpdd-survey
index e6878af..cabfb79 100755
--- a/lustre-iokit/sgpdd-survey/sgpdd-survey
+++ b/lustre-iokit/sgpdd-survey/sgpdd-survey
@@ -37,8 +37,6 @@ thrhi=${thrhi:-4096}
 #####################################################################
 # leave the rest of this alone unless you know what you're doing...
 
-# sgp_dd's idea of disk sector size (Bytes)
-bs=512
 # and max # threads one instance will spawn
 SG_MAX_QUEUE=16
 
@@ -80,6 +78,13 @@ fi
 
 ndevs=${#devs[@]}
 
+# determine block size. This should also work for raw devices
+# If it fails, set to 512
+bs=$((`sg_readcap -b ${devs[0]}  |awk '{print $2}'`))
+if [ $bs == 0  ];then
+	echo "sg_readcap failed, setting block size to 512"
+	bs=512
+fi
 rsltf=${rslt}.summary
 workf=${rslt}.detail
 echo -n > $rsltf
@@ -151,7 +156,9 @@ for ((rsz=$rszlo;rsz<=$rszhi;rsz*=2)); do
 		for ((i=0;i<ndevs;i++)); do
 		    for ((j=0;j<crg;j++)); do
 			rtmp=${tmpf}_${i}_${j}
-			if grep 'time to transfer data' $rtmp > /dev/null 2>&1; then
+			if grep 'error' $rtmp > /dev/null 2>&1; then
+				echo "Error found in $rtmp"
+			elif grep 'time to transfer data' $rtmp > /dev/null 2>&1; then
 			    ok=$((ok + 1))
 			fi
 			cat ${rtmp} >> $tmpf
-- 
1.8.3.1