X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Flocal.sh;h=95dd2768fc871637cf0ce459a4cfa0ce3fa59c05;hb=9570cac99cb852d8c0ba0694e8b4d33e32539775;hp=222ac30625b0f20d10506d4077f1c004cb75c2ab;hpb=b191d0b1a44458bb3ecebb0096fb3d373c500e21;p=fs%2Flustre-release.git

diff --git a/lustre/tests/local.sh b/lustre/tests/local.sh
index 222ac30..95dd276 100755
--- a/lustre/tests/local.sh
+++ b/lustre/tests/local.sh
@@ -1,35 +1,43 @@
 #!/bin/bash
 
+export PATH=`dirname $0`/../utils:$PATH
+
 config=${1:-local.xml}
 
-LMC=${LMC:-../utils/lmc}
+LMC="${LMC:-lmc} -m $config"
 TMP=${TMP:-/tmp}
 
-MDSDEV=$TMP/mds1
-MDSSIZE=50000
+MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
+MDSSIZE=${MDSSIZE:-100000}
+FSTYPE=${FSTYPE:-ext3}
+MOUNT=${MOUNT:-/mnt/lustre}
+#MOUNT2=${MOUNT2:-${MOUNT}2}
+NETWORKTYPE=${NETWORKTYPE:-tcp}
 
-OSTDEV=$TMP/ost1
-OSTSIZE=200000
+OSTDEV=${OSTDEV:-$TMP/ost1-`hostname`}
+OSTSIZE=${OSTSIZE:-200000}
 
-kver=`uname -r | cut -d "." -f 1,2`
+# specific journal size for the ost, in MB
+JSIZE=${JSIZE:-0}
+[ "$JSIZE" -gt 0 ] && JARG="--journal_size $JSIZE"
+MDSISIZE=${MDSISIZE:-128}
 
-case $kver in
-  2.4) FSTYPE="--fstype=extN"  ;;
-  2.5) FSTYPE="--fstype=ext3"  ;;
-  *) echo "Kernel version $kver not supported"
-     exit 1
-     ;;
-esac
+STRIPE_BYTES=65536
+STRIPES_PER_OBJ=0	# 0 means stripe over all OSTs
 
+rm -f $config
 
 # create nodes
-${LMC} -o $config --node localhost --net localhost tcp || exit 1
+${LMC} --add node --node localhost || exit 10
+${LMC} --add net --node  localhost --nid `hostname` --nettype $NETWORKTYPE || exit 11
 
 # configure mds server
-${LMC} -m $config --format --node localhost $FSTYPE --mds mds1 $MDSDEV $MDSSIZE || exit 2
+${LMC} --add mds --nspath /mnt/mds_ns  --node localhost --mds mds1 --fstype $FSTYPE --dev $MDSDEV --size $MDSSIZE $JARG --mkfsoptions "-I $MDSISIZE" || exit 20
 
 # configure ost
-${LMC} -m $config --format --node localhost --ost $OSTDEV $OSTSIZE || exit 3
+${LMC} -m $config --add lov --lov lov1 --mds mds1 --stripe_sz $STRIPE_BYTES --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 || exit 20
+${LMC} --add ost --nspath /mnt/ost_ns --node localhost --lov lov1 --fstype $FSTYPE --dev $OSTDEV --size $OSTSIZE $JARG || exit 30
 
 # create client config
-${LMC} -m $config --node localhost --mtpt /mnt/lustre mds1 OSC_localhost || exit 4
+${LMC} --add mtpt --node localhost --path $MOUNT --mds mds1 --lov lov1 || exit 40
+#${LMC} --add mtpt --node localhost --path $MOUNT2 --mds mds1 --lov lov1 || exit 40