land b_md onto HEAD:

[fs/lustre-release.git] / lustre / tests / runregression-net.sh

diff --git a/lustre/tests/runregression-net.sh b/lustre/tests/runregression-net.sh
index f0bbfbb..288f847 100644 (file)
--- a/lustre/tests/runregression-net.sh
+++ b/lustre/tests/runregression-net.sh
@@ -4,10 +4,19 @@ export PATH=/sbin:/usr/sbin:$PATH
 SRCDIR="`dirname $0`/"
 . $SRCDIR/common.sh
 
-setup_opts $@
+COUNT=${COUNT:-1000000}
+COUNT_10=`expr $COUNT / 10`
+COUNT_100=`expr $COUNT / 100`
+COUNT_1000=`expr $COUNT / 1000`
 
-setup_portals
-setup_lustre
+ENDRUN=endrun-`hostname`
+
+ECHONAME="`$OBDCTL device_list 2> /dev/null | awk '/ echo_client / { print $4 }' | tail -1`"
+
+if [ -z "$ECHONAME" ]; then
+       echo "$0: needs an ECHO_CLIENT set up first" 1>&2
+       exit 1
+fi
 
 runthreads() {
        THR=$1
@@ -20,6 +29,7 @@ runthreads() {
        test_getattr)
                RW=
                ;;
+
        test_brw_write)
                DO=test_brw
                RW=w
@@ -31,7 +41,7 @@ runthreads() {
                ;;
        esac
 
-       $OBDCTL --threads $THR v '$OSCDEV' $DO $CNT $RW $V $PGS $OID || exit 1
+       $OBDCTL --threads $THR v \$$ECHONAME $DO $CNT $RW $V $PGS $OID || exit 1
 
        if [ -e endrun ]; then
                rm endrun
@@ -40,10 +50,8 @@ runthreads() {
        fi
 }
 
-setup_server || exit -1
-setup_client || exit -1
-
-OID=`$OBDCTL --device '$OSCDEV' create 1 | awk '/is object id/ { print $6 }'`
+[ -z "$OID" ] && OID=`$OBDCTL --device \\$$ECHONAME create 1 | awk '/is object id/ { print $6 }'`
+[ -z "$OID" ] && echo "error creating object" 1>&2 && exit 1
 
 # TODO: obdctl needs to check on the progress of each forked thread
 #       (IPC SHM, sockets?) to see if it hangs.
@@ -57,13 +65,9 @@ for CMD in test_getattr test_brw_write test_brw_read; do
                PG=1
                PGV=16
                ;;
-
        test_brw_read)
                PG=1
-               case $OSTNODE in
-               ba*) PGV= ;; # disabled until the BA OST code is updated
-               *) PGV=16 ;;
-               esac
+               PGV=16
                ;;
        esac
 
@@ -74,33 +78,23 @@ for CMD in test_getattr test_brw_write test_brw_read; do
 
        debug_server_off
        debug_client_off
-       runthreads 1 $CMD 10000 100 $PG
-       [ "$PGV" ] && runthreads 1 $CMD 1000 100 $PGV
+       runthreads 1 $CMD $COUNT_100 -10 $PG
+       [ "$PGV" ] && runthreads 1 $CMD $COUNT_1000 -10 $PGV
 
-       runthreads 1 $CMD 1000000 -30 $PG
-       [ "$PGV" ] && runthreads 1 $CMD 100000 -30 $PGV
+       runthreads 1 $CMD $COUNT -30 $PG
+       [ "$PGV" ] && runthreads 1 $CMD $COUNT_10 -30 $PGV
 
-       debug_server_on
-       debug_client_on
-       runthreads 1 $CMD 100 1 $PG
+       runthreads 2 $CMD $COUNT_100 -30 $PG
+       [ "$PGV" ] && runthreads 2 $CMD $COUNT_1000 -30 $PGV
 
-       debug_server_off
-       debug_client_off
-       runthreads 2 $CMD 10000 100 $PG
-       [ "$PGV" ] && runthreads 2 $CMD 1000 100 $PGV
+       runthreads 2 $CMD $COUNT -30 $PG
+       [ "$PGV" ] && runthreads 2 $CMD $COUNT_10 -30 $PGV
 
-       runthreads 2 $CMD 1000000 -30 $PG
-       [ "$PGV" ] && runthreads 2 $CMD 100000 -30 $PGV
+       runthreads 10 $CMD $COUNT_10 -30 $PG
+       [ "$PGV" ] && runthreads 10 $CMD $COUNT_100 -30 $PGV
 
-       runthreads 10 $CMD 10000 1000 $PG
-       [ "$PGV" ] && runthreads 10 $CMD 1000 1000 $PGV
-
-       runthreads 100 $CMD 10000 -30 $PG
+       runthreads 100 $CMD $COUNT_100 -30 $PG
+       [ "$PGV" ] && runthreads 100 $CMD $COUNT_1000 -30 $PGV
 done
 
-$OBDCTL --device '$OSCDEV' destroy $OID
-
-cleanup_client || exit -1
-cleanup_server || exit -1
-cleanup_lustre
-cleanup_portals
+$OBDCTL --device \$$ECHONAME destroy $OID