X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Frunregression-net.sh;h=6de9a6c0f877be11d9fbbc20f142c6b4fc303ba8;hp=288f8477242e23ec1aa7932b56ce4dc876db746e;hb=93acd158c57c4c5d0fc751d46741231490c04707;hpb=25082b72dbe5a8e94a071632b86f45afadc706b4

diff --git a/lustre/tests/runregression-net.sh b/lustre/tests/runregression-net.sh
index 288f847..6de9a6c 100644
--- a/lustre/tests/runregression-net.sh
+++ b/lustre/tests/runregression-net.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
-export PATH=/sbin:/usr/sbin:$PATH
-
 SRCDIR="`dirname $0`/"
-. $SRCDIR/common.sh
+export PATH=/sbin:/usr/sbin:$SRCDIR/../utils:$PATH
 
 COUNT=${COUNT:-1000000}
 COUNT_10=`expr $COUNT / 10`
@@ -11,13 +9,17 @@ COUNT_1000=`expr $COUNT / 1000`
 
 ENDRUN=endrun-`hostname`
 
-ECHONAME="`$OBDCTL device_list 2> /dev/null | awk '/ echo_client / { print $4 }' | tail -1`"
+ECHONAME="`lctl 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
 
+cleanup () {
+	lctl --device \$$ECHONAME destroy $OID
+}
+	
 runthreads() {
 	THR=$1
 	DO=$2
@@ -29,28 +31,26 @@ runthreads() {
 	test_getattr)
 		RW=
 		;;
-
 	test_brw_write)
 		DO=test_brw
 		RW=w
 		;;
-
 	test_brw_read)
 		DO=test_brw
 		RW=r
 		;;
 	esac
 
-	$OBDCTL --threads $THR v \$$ECHONAME $DO $CNT $RW $V $PGS $OID || exit 1
+	lctl --threads $THR v \$$ECHONAME $DO $CNT $RW $V $PGS $OID || exit 1
 
-	if [ -e endrun ]; then
-		rm endrun
-		echo "exiting because endrun file was found"
-		exit 0
+	if [ -e $ENDRUN ]; then
+		rm $ENDRUN
+		echo "exiting because $ENDRUN file was found"
+		cleanup
 	fi
 }
 
-[ -z "$OID" ] && OID=`$OBDCTL --device \\$$ECHONAME create 1 | awk '/is object id/ { print $6 }'`
+[ -z "$OID" ] && OID=`lctl --device \\$$ECHONAME create 1 | awk '/is object id/ { print $6 }'` && echo "created object $OID"
 [ -z "$OID" ] && echo "error creating object" 1>&2 && exit 1
 
 # TODO: obdctl needs to check on the progress of each forked thread
@@ -63,11 +63,11 @@ for CMD in test_getattr test_brw_write test_brw_read; do
 		;;
 	test_brw_write)
 		PG=1
-		PGV=16
+		PGV=${PGV:-16}
 		;;
 	test_brw_read)
 		PG=1
-		PGV=16
+		PGV=${PGV:-16}
 		;;
 	esac
 
@@ -76,8 +76,7 @@ for CMD in test_getattr test_brw_write test_brw_read; do
 	runthreads 1 $CMD 1 1 $PG
 	runthreads 1 $CMD 100 1 $PG
 
-	debug_server_off
-	debug_client_off
+	echo 0 > /proc/sys/portals/debug
 	runthreads 1 $CMD $COUNT_100 -10 $PG
 	[ "$PGV" ] && runthreads 1 $CMD $COUNT_1000 -10 $PGV
 
@@ -97,4 +96,4 @@ for CMD in test_getattr test_brw_write test_brw_read; do
 	[ "$PGV" ] && runthreads 100 $CMD $COUNT_1000 -30 $PGV
 done
 
-$OBDCTL --device \$$ECHONAME destroy $OID
+lctl --device \$$ECHONAME destroy $OID