merge b_devel into HEAD, which will become 0.7.3

[fs/lustre-release.git] / lustre / tests / echo.sh

diff --git a/lustre/tests/echo.sh b/lustre/tests/echo.sh
index 335db41..b4fe5a4 100755 (executable)
--- a/lustre/tests/echo.sh
+++ b/lustre/tests/echo.sh
@@ -21,8 +21,9 @@ CLIENTNID=${CLIENTNID:-$CLIENT}
 
 
 # FIXME: make LMC not require MDS for obdecho LOV
-MDSDEV=${MDSDEV:-$TMP/mds1}
+MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
 MDSSIZE=10000
+FSTYPE=${FSTYPE:-ext3}
 
 STRIPE_BYTES=65536
 STRIPES_PER_OBJ=2      # 0 means stripe over all OSTs
@@ -33,7 +34,7 @@ $LMC --add node --node $SERVER  || exit 1
 $LMC --add net --node $SERVER --nid $SERVERNID --nettype $NET || exit 2
 
 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 ost --node $SERVER --lov lov1 --osdtype=obdecho || exit 12
     $LMC --add ost --node $SERVER --lov lov1 --osdtype=obdecho || exit 13