Merge b_md to HEAD for 0.5.19 release.

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

diff --git a/lustre/tests/uml.sh b/lustre/tests/uml.sh
index a8a381b..112a796 100644 (file)
--- a/lustre/tests/uml.sh
+++ b/lustre/tests/uml.sh
@@ -21,28 +21,28 @@ OSTSIZE=100000
 
 # Three separate systems
 MDSNODE=uml1
-OSTNODE=uml2
+OSTNODES="uml2 uml2"
 CLIENTS="uml3"
 
 # Single system with additional clients
 #MDSNODE=uml1
-#OSTNODE=uml1
+#OSTNODES="uml1 uml1"
 #CLIENTS="$MDSNODE client"
 
 # Two systems with client on MDS, and additional clients (set up OST first)
 #MDSNODE=uml1
-#OSTNODE=uml2
+#OSTNODES="uml2 uml2"
 #CLIENTS="$MDSNODE client"
 
 # Two systems with client on OST, and additional clients (set up MDS first)
 #MDSNODE=uml1
-#OSTNODE=uml2
-#CLIENTS="$OSTNODE client"
+#OSTNODES="uml2 uml2"
+#CLIENTS="$OSTNODES client"
 
 rm -f $config
 
 # create nodes
-for NODE in $MDSNODE $OSTNODE $CLIENTS; do
+for NODE in $MDSNODE $OSTNODES $CLIENTS; do
        eval [ \$$NODE ] && continue
        ${LMC} -m $config --add net --node $NODE --nid $NODE --nettype tcp || exit 1
        eval "$NODE=done"
@@ -53,11 +53,14 @@ ${LMC} -m $config --add mds --format --node $MDSNODE --mds mds1 --dev $MDSDEV --
 
 # configure ost
 ${LMC} -m $config --add lov --lov lov1 --mds mds1 --stripe_sz 65536 --stripe_cnt 0 --stripe_pattern 0 || exit 20
-${LMC} -m $config --add ost --node $OSTNODE --lov lov1 --dev $OSTDEV1 --size $OSTSIZE || exit 21
-${LMC} -m $config --add ost --node $OSTNODE --lov lov1 --dev $OSTDEV2 --size $OSTSIZE || exit 22
+COUNT=1
+for NODE in $OSTNODES; do
+       eval OSTDEV=\$OSTDEV$COUNT
+        ${LMC} -m $config --add ost --node $NODE --lov lov1 --dev $OSTDEV --size $OSTSIZE || exit 21
+       COUNT=`expr $COUNT + 1`
+done
 
 # create client config(s)
 for NODE in $CLIENTS; do
        ${LMC} -m $config --add mtpt --node $NODE --path /mnt/lustre --mds mds1 --lov lov1 || exit 30
 done
-