Remove PORT specification, so we get the (correct) default if it changes

(and people haven't copied the fixed port number to dozens of configs
like I did.

diff --git a/lustre/tests/.cvsignore b/lustre/tests/.cvsignore
index 77a19f9..e082536 100644 (file)
--- a/lustre/tests/.cvsignore
+++ b/lustre/tests/.cvsignore
@@ -21,6 +21,8 @@ test_brw
 newfile
 openclose
 createdestroy
+createmany
+mkdirmany
 lovstripe
 lov.xml
 uml.xml

diff --git a/lustre/tests/mcr-individual-ost-nogw-config.sh b/lustre/tests/mcr-individual-ost-nogw-config.sh
index fa47e49..76c9fd5 100755 (executable)
--- a/lustre/tests/mcr-individual-ost-nogw-config.sh
+++ b/lustre/tests/mcr-individual-ost-nogw-config.sh
@@ -9,7 +9,6 @@ LMC_REAL="../../lustre/utils/lmc -m $config"
 SERVER_START=0
 SERVER_CNT=62
 
-PORT=988
 TCPBUF=1048576
  
 h2ip () {
@@ -23,7 +22,7 @@ save_cmd() {
 [ -f $config ] && rm $config
 
 # Client node
-${LMC} --node client --tcpbuf $TCPBUF --net '*' tcp $PORT || exit 1
+${LMC} --node client --tcpbuf $TCPBUF --net '*' tcp || exit 1
 
 # this is crude, but effective
 let server_per_gw=($SERVER_CNT / $GW_CNT )
@@ -33,13 +32,13 @@ let server=$SERVER_START
 while (( $server < $SERVER_CNT + SERVER_START ));
 do 
       echo "server: $server"
-      ba=ba$server
+      OST=ba$server
       # server node
-      ${LMC} --node $ba --tcpbuf $TCPBUF --net $ba tcp $PORT || exit 1
+      ${LMC} --node $ba --tcpbuf $TCPBUF --net $OST tcp || exit 1
       # the device on the server
-      ${LMC} --node $ba --obdtype=obdecho --ost || exit 3
+      ${LMC} --node $OST --obdtype=obdecho --ost || exit 3
       # osc on client
-      ${LMC} --node client --osc OSC_$ba
+      ${LMC} --node client --osc OSC_$OST
       let server=$server+1 
 done
 

diff --git a/lustre/tests/mcr-mds-failover-config.sh b/lustre/tests/mcr-mds-failover-config.sh
index ca539be..8a42c3d 100755 (executable)
--- a/lustre/tests/mcr-mds-failover-config.sh
+++ b/lustre/tests/mcr-mds-failover-config.sh
@@ -11,7 +11,6 @@ OST_UUID=10400010-5dec-11c2-0b5f-00301700041a
 MDS_DEVICE=/dev/sda3
 MDS_SIZE=500000
 TCPBUF=1048576
-TCPPORT=988
 
 MDSNODES=`$LUSTRE_QUERY -h emcri -s id=mds -f`
 ACTIVEMDS=`$LUSTRE_QUERY -h emcri -s id=mds -a`
@@ -41,7 +40,7 @@ for mds in $MDSNODES; do
 done
 
 # create OST node entry
-$LMC -m $CONFIG --node $OST_BA --tcpbuf $TCPBUF --net $OST_BA tcp $TCPPORT
+$LMC -m $CONFIG --node $OST_BA --tcpbuf $TCPBUF --net $OST_BA tcp
 $LMC -m $CONFIG --node $OST_BA --obduuid $OST_UUID --ost bluearc
 $LMC -m $CONFIG --node $GW_NODE --route tcp `h2ip $GW_NODE` $OST_BA
 

diff --git a/lustre/tests/mcr.sh b/lustre/tests/mcr.sh
index 7bfc35a..c7f7919 100755 (executable)
--- a/lustre/tests/mcr.sh
+++ b/lustre/tests/mcr.sh
@@ -12,7 +12,6 @@ ROUTER=dev5
 CLIENT_LO=dev2
 CLIENT_HI=dev25
 
-PORT=988
 TCPBUF=1048576
  
 
@@ -29,14 +28,14 @@ h2ip () {
 # Client node
 ${LMC} --node client --net '*' elan || exit 1
 # Router node
-${LMC} --router --node $ROUTER --tcpbuf $TCPBUF --net `h2ip $ROUTER`  tcp $PORT || exit 1
+${LMC} --router --node $ROUTER --tcpbuf $TCPBUF --net `h2ip $ROUTER`  tcp || exit 1
 ${LMC} --node $ROUTER --net `h2elan $ROUTER` elan|| exit 1
 ${LMC} --node $ROUTER --route elan `h2elan $ROUTER` `h2elan $CLIENT_LO` `h2elan $CLIENT_HI` || exit 2
 
 for s in $SERVERS
  do
    # server node
-   ${LMC} --node $s --tcpbuf $TCPBUF --net $s tcp $PORT || exit 1
+   ${LMC} --node $s --tcpbuf $TCPBUF --net $s tcp || exit 1
    # route to server
    ${LMC} --node $ROUTER --route tcp `h2ip $ROUTER` $s || exit 2
    # the device on the server

diff --git a/lustre/tests/mcrlov.sh b/lustre/tests/mcrlov.sh
index 93f1247..35ba323 100755 (executable)
--- a/lustre/tests/mcrlov.sh
+++ b/lustre/tests/mcrlov.sh
@@ -14,7 +14,6 @@ TMP=${TMP:-/tmp}
 CLIENT_LO=dev2
 CLIENT_HI=dev25
 
-PORT=988
 TCPBUF=1048576
  
 
@@ -31,7 +30,7 @@ h2ip () {
 # Client node
 ${LMC} --node client --net '*' elan || exit 1
 # Router node
-${LMC} --router --node $ROUTER --tcpbuf $TCPBUF --net `h2ip $ROUTER`  tcp $PORT || exit 1
+${LMC} --router --node $ROUTER --tcpbuf $TCPBUF --net `h2ip $ROUTER`  tcp || exit 1
 ${LMC} --node $ROUTER --net `h2elan $ROUTER` elan|| exit 1
 ${LMC} --node $ROUTER --route elan `h2elan $ROUTER` `h2elan $CLIENT_LO` `h2elan $CLIENT_HI` || exit 2
 
@@ -44,7 +43,7 @@ ${LMC} --node client --mtpt /mnt/lustre mds1 lov1
 for s in $SERVERS
  do
    # server node
-   ${LMC} --node $s --tcpbuf $TCPBUF --net $s tcp $PORT || exit 1
+   ${LMC} --node $s --tcpbuf $TCPBUF --net $s tcp || exit 1
    # route to server
    ${LMC} --node $ROUTER --route tcp `h2ip $ROUTER` $s || exit 2
    # the device on the server