Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
b=24300 Don't run autogen.sh in the spl and zfs repos.
[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
94946c0
..
6d99457
100755
(executable)
--- a/
lustre-iokit/sgpdd-survey/sgpdd-survey
+++ b/
lustre-iokit/sgpdd-survey/sgpdd-survey
@@
-41,21
+41,35
@@
thrhi=${thrhi:-4096}
# and max # threads one instance will spawn
SG_MAX_QUEUE=16
# and max # threads one instance will spawn
SG_MAX_QUEUE=16
+# is the sg module loaded?
+sg_is_loaded=$(grep -q "^sg " /proc/modules && echo true || echo false)
+
+# did we load it?
+sg_was_loaded=false
+
# map given device names into SG device names
i=0
devs=()
if [ "$scsidevs" ]; then
# we will test for a LUN, the test for a partition
# if the partition number is > 9 this will fail
# map given device names into SG device names
i=0
devs=()
if [ "$scsidevs" ]; then
# we will test for a LUN, the test for a partition
# if the partition number is > 9 this will fail
+
+ # make sure sg kernel module is loaded
+ if ! $sg_is_loaded; then
+ echo "loading the sg kernel module"
+ modprobe sg && sg_was_loaded=true
+ sg_is_loaded=true
+ fi
+
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"
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]$//'`
+ pt=`echo $d | sed 's/[0-9]
*
$//'`
# Try again
devs[$i]=`sg_map | awk "{if (\\\$2 == \"$pt\") print \\\$1}"`
if [ -z "${devs[i]}" ]; then
# Try again
devs[$i]=`sg_map | awk "{if (\\\$2 == \"$pt\") print \\\$1}"`
if [ -z "${devs[i]}" ]; then
- echo
"Can't find SG device $pt
"
+ echo
-e "Can't find SG device $pt.\nDo you have the sg module configured for your kernel?
"
exit 1
fi
fi
exit 1
fi
fi
@@
-136,7
+150,9
@@
for ((rsz=$rszlo;rsz<=$rszhi;rsz*=2)); do
dev=${devs[i]}
devsize=$((bs*`sg_readcap -b ${dev} | awk '{print $1}'`/1024))
if [ $devsize -lt $actual_size ]; then
dev=${devs[i]}
devsize=$((bs*`sg_readcap -b ${dev} | awk '{print $1}'`/1024))
if [ $devsize -lt $actual_size ]; then
- echo -e "device $(sg_map | grep $dev | awk '{ print $2; }') not big enough: $devsize < $actual_size.\nConsider reducing \$size"
+ _dev=$(sg_map | grep $dev | awk '{ print $2; }')
+ echo -e "device $_dev not big enough: $devsize <" \
+ "$actual_size.\nConsider reducing \$size"
exit 1
fi
if [ $action = read ]; then
exit 1
fi
if [ $action = read ]; then
@@
-189,3
+205,8
@@
for ((rsz=$rszlo;rsz<=$rszhi;rsz*=2)); do
done
done
done
done
done
done
+
+if $sg_was_loaded; then
+ echo "unloading sg module"
+ rmmod sg
+fi