land b_md onto HEAD:

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

diff --git a/lustre/tests/uml.sh b/lustre/tests/uml.sh
index 6070723..7d8da8f 100644 (file)
--- a/lustre/tests/uml.sh
+++ b/lustre/tests/uml.sh
@@ -11,14 +11,42 @@ OSTDEV1=$TMP/ost1
 OSTDEV2=$TMP/ost2
 OSTSIZE=100000
 
+# NOTE - You can't have different MDS/OST nodes and also have clients on the
+#        MDS/OST nodes without using --endlevel and --startlevel during lconf.
+#        You can put both MDS/OST on one node and client can be there too.
+#        CLIENTS is a space-separated list of client nodes.
+#
+#        The rule is that both the MDS and the OST must be set up before any
+#        of the clients can be started, so plan accordingly.
+
+# Three separate systems
 MDSNODE=uml1
 OSTNODE=uml2
-CLIENT=uml3
+CLIENTS="uml3"
+
+# Single system with additional clients
+#MDSNODE=uml1
+#OSTNODE=uml1
+#CLIENTS="$MDSNODE client"
+
+# Two systems with client on MDS, and additional clients (set up OST first)
+#MDSNODE=uml1
+#OSTNODE=uml2
+#CLIENTS="$MDSNODE client"
+
+# Two systems with client on OST, and additional clients (set up MDS first)
+#MDSNODE=uml1
+#OSTNODE=uml2
+#CLIENTS="$OSTNODE client"
+
+rm -f $config
 
 # create nodes
-${LMC} -o $config --node $MDSNODE --net $MDSNODE tcp || exit 1
-${LMC} -m $config --node $OSTNODE --net $OSTNODE tcp || exit 2
-${LMC} -m $config --node $CLIENT --net $CLIENT tcp || exit 3
+for NODE in $MDSNODE $OSTNODE $CLIENTS; do
+       eval [ \$$NODE ] && continue
+       ${LMC} -m $config --node $NODE --net $NODE tcp || exit 1
+       eval "$NODE=done"
+done
 
 # configure mds server
 ${LMC} -m $config --format --node $MDSNODE --mds mds1 $MDSDEV $MDSSIZE ||exit 10
@@ -28,6 +56,8 @@ ${LMC} -m $config  --lov lov1 mds1 65536 0 0 || exit 20
 ${LMC} -m $config --node $OSTNODE --lov lov1 --ost $OSTDEV1 $OSTSIZE || exit 21
 ${LMC} -m $config --node $OSTNODE --lov lov1 --ost $OSTDEV2 $OSTSIZE || exit 22
 
-# create client config
-${LMC} -m $config  --node $CLIENT --mtpt /mnt/lustre mds1 lov1 || exit 30
+# create client config(s)
+for NODE in $CLIENTS; do
+       ${LMC} -m $config  --node $NODE --mtpt /mnt/lustre mds1 lov1 || exit 30
+done