X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Flov.sh;h=598ece5306b1afb87d24a18193640c7836059582;hb=3205f18ff2b9dadbffa0aa182e8da44967a03e11;hp=8b15f8fef832e27a0023fc50ef6b6ed09ef2262c;hpb=30067c13eb00be7e44b1e2c939455c91da4df19e;p=fs%2Flustre-release.git

diff --git a/lustre/tests/lov.sh b/lustre/tests/lov.sh
index 8b15f8f..598ece5 100755
--- a/lustre/tests/lov.sh
+++ b/lustre/tests/lov.sh
@@ -1,25 +1,62 @@
 #!/bin/bash
 
-if [ -z "$1" ]; then
-   config=lov.xml
-else
-   config=$1
-fi
+set -e
+
+export PATH=`dirname $0`/../utils:$PATH
+
+config=${1:-lov.xml}
+
+LMC="${LMC:-lmc} -m $config"
+TMP=${TMP:-/tmp}
+
+MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
+MDSSIZE=${MDSSIZE:-400000}
+FSTYPE=${FSTYPE:-ext3}
+MOUNT=${MOUNT:-/mnt/lustre}
+MOUNT2=${MOUNT2:-${MOUNT}2}
+NETTYPE=${NETTYPE:-tcp}
+
+OSTCOUNT=${OSTCOUNT:-5}
+# OSTDEVN will still override the device for OST N
 
-LMC=../utils/lmc
+OSTSIZE=${OSTSIZE:-150000}
+# 1 to config an echo client instead of llite
+ECHO_CLIENT=${ECHO_CLIENT:-}
 
-echo "FIXME: autoformat is no by default, edit $config to change"
+STRIPE_BYTES=524288
+STRIPES_PER_OBJ=${STRIPES_PER_OBJ:-$((OSTCOUNT -1))}
+
+# specific journal size for the ost, in MB
+JSIZE=${JSIZE:-0}
+JARG=""
+[ "$JSIZE" -gt 0 ] && JARG="--journal_size $JSIZE"
+
+rm -f $config
 
 # create nodes
-${LMC} -o $config --node localhost --net localhost tcp 
+${LMC} --add node --node localhost || exit 10
+${LMC} --add net --node  localhost --nid `hostname` --nettype $NETTYPE || exit 11
+${LMC} --add net --node client --nid '*' --nettype $NETTYPE || exit 12
+
 
 # configure mds server
-${LMC} -m $config --format --node localhost --mds mds1 /tmp/mds1 50000
+${LMC} --format --add mds --node localhost --mds mds1 --fstype $FSTYPE --dev $MDSDEV --size $MDSSIZE || exit 20
 
 # configure ost
-${LMC} -m $config --lov lov1 mds1 4096 0 0
-${LMC} -m $config --format --node localhost --lov lov1 --ost /tmp/ost1 100000
-${LMC} -m $config --format --node localhost --lov lov1 --ost /tmp/ost2 100000
+${LMC} --add lov --lov lov1 --mds mds1 --stripe_sz $STRIPE_BYTES --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 || exit 20
+
+for num in `seq $OSTCOUNT`; do
+    OST=ost$num
+    DEVPTR=OSTDEV$num
+    eval $DEVPTR=${!DEVPTR:=$TMP/$OST-`hostname`}
+    ${LMC} --add ost --node localhost --lov lov1 --ost $OST --fstype $FSTYPE --dev ${!DEVPTR} --size $OSTSIZE $JARG || exit 30
+done
 
-# create client config
-${LMC} -m $config  --node localhost --mtpt /mnt/lustre mds1 lov1
+
+if [ -z "$ECHO_CLIENT" ]; then
+	# create client config
+	${LMC} --add mtpt --node localhost --path $MOUNT --clientoptions async --mds mds1 --lov lov1 || exit 40
+	${LMC} --add mtpt --node client --path $MOUNT2 --clientoptions async --mds mds1 --lov lov1 || exit 41
+else
+	${LMC} --add echo_client --node localhost --ost lov1 || exit 42
+fi