Merge fixes from b_md to HEAD so tinderbox can run.

diff --git a/lustre/tests/ba-mount.sh b/lustre/tests/ba-mount.sh
index 91cd780..badc63b 100644 (file)
--- a/lustre/tests/ba-mount.sh
+++ b/lustre/tests/ba-mount.sh
@@ -36,11 +36,11 @@ ${LMC} --add net --node $MDS --tcpbuf $TCPBUF --nid $MDS --nettype tcp
 ${LMC} --add mds --node $MDS --mds mds1 --dev /tmp/mds1 --size 50000
 
 OBD_UUID=`awk "/$OST / { print \\$3 }" $UUIDLIST`
-[ "$OBD_UUID" ] && OBD_UUID="--obduuid=$OBD_UUID" || echo "$OST: no UUID"
+[ "$OBD_UUID" ] && OBD_UUID="--obduuid $OBD_UUID" || echo "$OST: no UUID"
 
 # server node
 ${LMC} --add net --node $OST --tcpbuf $TCPBUF --nid $OST --nettype tcp
-${LMC} --add ost --node $OST -obd obd1 --obduuid $OBD_UUID --dev bluearc
+${LMC} --add ost --node $OST --obd obd1 $OBD_UUID --dev bluearc
 
 # mount point on the MDS/client
 ${LMC} --add mtpt --node $MDS --path /mnt/lustre --mds mds1 --lov obd1

diff --git a/lustre/tests/llecho.sh b/lustre/tests/llecho.sh
index c077223..d2497a4 100644 (file)
--- a/lustre/tests/llecho.sh
+++ b/lustre/tests/llecho.sh
@@ -4,7 +4,7 @@ LCONF=${LCONF:-../utils/lconf}
 NAME=${NAME:-echo}
 
 config=$NAME.xml
-mkconfig=./$NAME.sh
+mkconfig=$NAME.sh
 
 sh $mkconfig $config || exit 1
 

diff --git a/lustre/tests/llechocleanup.sh b/lustre/tests/llechocleanup.sh
index 2d63fa9..cd87766 100755 (executable)
--- a/lustre/tests/llechocleanup.sh
+++ b/lustre/tests/llechocleanup.sh
@@ -5,7 +5,7 @@ NAME=${NAME:-echo}
 TMP=${TMP:-/tmp}
 
 config=$NAME.xml
-mkconfig=./$NAME.sh
+mkconfig=$NAME.sh
 
 if [ ! -f $config ]; then
    sh $mkconfig $config || exit 1

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index efc7c0c..bc30630 100755 (executable)
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -5,7 +5,7 @@ LCONF=${LCONF:-../utils/lconf}
 NAME=${NAME:-local}
 
 config=$NAME.xml
-mkconfig=./$NAME.sh
+mkconfig=$NAME.sh
 
 sh $mkconfig $config || exit 1
 

diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index b8b99d9..2bd991f 100755 (executable)
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -5,7 +5,7 @@ NAME=${NAME:-local}
 TMP=${TMP:-/tmp}
 
 config=$NAME.xml
-mkconfig=./$NAME.sh
+mkconfig=$NAME.sh
 
 if [ ! -f $config ]; then
    sh $mkconfig $config || exit 1

diff --git a/lustre/tests/llrmount.sh b/lustre/tests/llrmount.sh
index ae244c1..c559821 100755 (executable)
--- a/lustre/tests/llrmount.sh
+++ b/lustre/tests/llrmount.sh
@@ -4,7 +4,7 @@ LCONF=${LCONF:-../utils/lconf}
 NAME=${NAME:-local}
 
 config=$NAME.xml
-mkconfig=./$NAME.sh
+mkconfig=$NAME.sh
 
 if [ ! -f $config -o $mkconfig -nt $config ]; then
    sh $mkconfig $config || exit 1

diff --git a/lustre/tests/mcr-routed-config.sh b/lustre/tests/mcr-routed-config.sh
index eb2bec1..096520e 100755 (executable)
--- a/lustre/tests/mcr-routed-config.sh
+++ b/lustre/tests/mcr-routed-config.sh
@@ -15,17 +15,17 @@ LMC_REAL="../../lustre/utils/lmc -m $config"
 
 # TCP/IP servers
 SERVER_START=0
-SERVER_CNT=64
+SERVER_CNT=32
 GW_START=0
-GW_CNT=32
+GW_CNT=16
 MDS=${BASE}23
 UUIDLIST=${UUIDLIST:-/usr/local/admin/ba-ost/UUID.txt}
 
 echo "MDS: $MDS"
 
 # This is needed for to create route for elan network
-CLIENT_LO=36
-CLIENT_HI=155
+CLIENT_LO=38
+CLIENT_HI=191
 
 TCPBUF=1048576
  
@@ -75,11 +75,11 @@ do
       OST=${OSTBASE}$server
       echo "server: $OST"
       OBD_UUID=`awk "/$OST / { print \\$3 }" $UUIDLIST`
-      [ "$OBD_UUID" ] && OBD_UUID="--obduuid=$OBD_UUID" || echo "$OST: no UUID"
+      [ "$OBD_UUID" ] && OBD_UUID="--obduuid $OBD_UUID" || echo "$OST: no UUID"
       # server node
       ${LMC} --add net --node $OST --tcpbuf $TCPBUF --nid $OST --nettype tcp || exit 1
       # the device on the server
-      ${LMC} --add ost --lov lov1 --node $OST --obduuid $OBD_UUID --dev bluearc || exit 3
+      ${LMC} --add ost --lov lov1 --node $OST $OBD_UUID --dev bluearc || exit 3
       # route to server
       ${LMC} --add route --node $gwnode --nettype tcp --gw `h2ip $gwnode` --lo $OST || exit 2
       let server=$server+1