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
update to krb5 script: check krytab for root.
[fs/lustre-release.git]
/
lustre
/
tests
/
echo.sh
diff --git
a/lustre/tests/echo.sh
b/lustre/tests/echo.sh
index
f30f056
..
61a0378
100755
(executable)
--- a/
lustre/tests/echo.sh
+++ b/
lustre/tests/echo.sh
@@
-1,47
+1,72
@@
#!/bin/bash
#!/bin/bash
-config=${1:-$(basename $0 .sh).xml}
+LOV=${LOV:-0}
+while [ "$1" ]; do
+ case $1 in
+ --lov) LOV="1" ;;
+ *) [ -z $config ] && config=$1 || OPTS="$OPTS $1" ;;
+ esac
+ shift
+done
+
+config=${config:-$(basename $0 .sh).xml}
LMC=${LMC:-../utils/lmc -m $config}
LMC=${LMC:-../utils/lmc -m $config}
+TMP=${TMP:-/tmp}
-SERVER=localhost
-CLIENT=localhost
+SERVER=${SERVER:-localhost}
+CLIENT=${CLIENT:-localhost}
+NET=${NET:-tcp}
-# FIXME: make LMC not require MDS for obdecho LOV
-MDSDEV=$TMP/mds1
-MDSSIZE=10000
+h2tcp () {
+ case $1 in
+ client) echo '\*' ;;
+ *) echo $1 ;;
+ esac
+}
-STRIPE_BYTES=65536
-STRIPES_PER_OBJ=2 # 0 means stripe over all OSTs
+h2gm () {
+ echo `gmnalnid -n $1`
+}
-LOV=0
-while [ "$1" ]; do
+h2elan () {
+ echo $1 | sed 's/[^0-9]*//g'
+}
+
+h2iib () {
case $1 in
case $1 in
-
--lov) LOV="1"
;;
-
*) OPTS="$OPTS $1
" ;;
+
client) echo '\*'
;;
+
*) echo $1 | sed "s/[^0-9]*//
" ;;
esac
esac
- shift
-done
+}
+
+# FIXME: make LMC not require MDS for obdecho LOV
+MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
+MDSSIZE=10000
+FSTYPE=${FSTYPE:-ext3}
+
+STRIPE_BYTES=1048576
+STRIPES_PER_OBJ=2 # 0 means stripe over all OSTs
rm -f $config
# create nodes
$LMC --add node --node $SERVER || exit 1
rm -f $config
# create nodes
$LMC --add node --node $SERVER || exit 1
-$LMC --add net --node $SERVER --nid
$SERVER --nettype tcp
|| exit 2
+$LMC --add net --node $SERVER --nid
`h2$NET $SERVER` --nettype $NET
|| exit 2
if (($LOV)); then
if (($LOV)); then
- $LMC --add mds --node $SERVER --mds mds1 --dev $MDSDEV --size $MDSSIZE || exit 10
+ $LMC --add mds --node $SERVER --mds mds1 --
fstype $FSTYPE --
dev $MDSDEV --size $MDSSIZE || exit 10
$LMC --add lov --lov lov1 --mds mds1 --stripe_sz $STRIPE_BYTES --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 || exit 11
$LMC --add lov --lov lov1 --mds mds1 --stripe_sz $STRIPE_BYTES --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 || exit 11
- $LMC --add ost --node $SERVER --lov lov1 --o
b
dtype=obdecho || exit 12
- $LMC --add ost --node $SERVER --lov lov1 --o
b
dtype=obdecho || exit 13
+ $LMC --add ost --node $SERVER --lov lov1 --o
s
dtype=obdecho || exit 12
+ $LMC --add ost --node $SERVER --lov lov1 --o
s
dtype=obdecho || exit 13
OBD_NAME=lov1
else
OBD_NAME=lov1
else
- $LMC --add ost --o
bd obd1 --node $SERVER --obdtype=obdecho || exit
2
+ $LMC --add ost --o
st obd1 --node $SERVER --osdtype=obdecho || exit 1
2
OBD_NAME=obd1
fi
if [ "$SERVER" != "$CLIENT" ]; then
$LMC --add node --node $CLIENT || exit 1
OBD_NAME=obd1
fi
if [ "$SERVER" != "$CLIENT" ]; then
$LMC --add node --node $CLIENT || exit 1
- $LMC --add net --node $CLIENT --nid
$CLIENT --nettype tcp
|| exit 2
+ $LMC --add net --node $CLIENT --nid
`h2$NET $CLIENT` --nettype $NET
|| exit 2
fi
fi
-$LMC --add echo_client --node $CLIENT --o
bd
${OBD_NAME} || exit 3
+$LMC --add echo_client --node $CLIENT --o
st
${OBD_NAME} || exit 3