From: adilger <adilger>
Date: Sun, 8 Sep 2002 08:51:34 +0000 (+0000)
Subject: Update scripts to not do vector reads on BA OSTs.
X-Git-Tag: v1_7_100~4829
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=87650700c479dbd1b8e9905794f175395c9185be;p=fs%2Flustre-release.git

Update scripts to not do vector reads on BA OSTs.
Do some quickie tests in -brw so we know things are at least close to good.
---

diff --git a/lustre/tests/runregression-brw.sh b/lustre/tests/runregression-brw.sh
index 7535864..0d81b4e 100644
--- a/lustre/tests/runregression-brw.sh
+++ b/lustre/tests/runregression-brw.sh
@@ -26,16 +26,16 @@ runthreads() {
 		;;
 	esac
 
+	$OBDCTL --threads $THR v '$OSCDEV' $DO $CNT $RW $V $PGS $OID || exit 1
+
 	if [ -e endrun ]; then
 		rm endrun
 		echo "exiting because endrun file was found"
 		exit 0
 	fi
-
-	$OBDCTL --threads $THR v '$OSCDEV' $DO $CNT $RW $V $PGS $OID || exit 1
 }
 
-if [  -z "`$OBDCTL device_list | grep osc`" ]; then
+if [  -z "`$OBDCTL device_list 2> /dev/null | grep osc`" ]; then
 	setup_opts $@
 
 	setup_portals
@@ -52,46 +52,68 @@ OID=`$OBDCTL --device '$OSCDEV' create 1 | awk '/is object id/ { print $6 }'`
 #       (IPC SHM, sockets?) to see if it hangs.
 while date; do
 	PG=1
-	PGV=16
+	PGVW=16
+	case $OSTNODE in
+	ba*) PGVR= ;; # disabled until the BA OST code is updated
+	*) PGVR=16 ;;
+	esac
+
 	# We use '--threads 1 X' instead of '--device X' so that
 	# obdctl can monitor the forked thread for progress (TODO).
 	debug_server_off
 	debug_client_off
+	runthreads 1 test_brw_write 1000 -30 $PG
+	runthreads 1 test_brw_read 1000 -30 $PG
+
+	[ "$PGVW" ] && runthreads 1 test_brw_write 100 -30 $PGVW
+	[ "$PGVW" ] && runthreads 1 test_brw_read 1600 -30 $PG
+	[ "$PGVR" ] && runthreads 1 test_brw_read 100 -30 $PGVR
+
 	runthreads 1 test_brw_write 10000000 -30 $PG
 	runthreads 1 test_brw_read 10000000 -30 $PG
 
-	[ "$PGV" ] && runthreads 1 test_brw_write 1000000 -30 $PGV
-	[ "$PGV" ] && runthreads 1 test_brw_read 1000000 -30 $PGV
+	[ "$PGVW" ] && runthreads 1 test_brw_write 1000000 -30 $PGVW
+	[ "$PGVW" ] && runthreads 1 test_brw_read 16000000 -30 $PG
+	[ "$PGVR" ] && runthreads 1 test_brw_read 1000000 -30 $PGVR
 
 	runthreads 2 test_brw_write 10000000 -30 $PG
 	runthreads 2 test_brw_read 10000000 -30 $PG
 
-	[ "$PGV" ] && runthreads 2 test_brw_write 1000000 -30 $PGV
-	[ "$PGV" ] && runthreads 2 test_brw_read 1000000 -30 $PGV
+	[ "$PGVW" ] && runthreads 2 test_brw_write 1000000 -30 $PGVW
+	[ "$PGVW" ] && runthreads 1 test_brw_read 16000000 -30 $PG
+	[ "$PGVR" ] && runthreads 2 test_brw_read 1000000 -30 $PGVR
 
 	runthreads 10 test_brw_write 1000000 -30 $PG
+	runthreads 1 test_brw_read 16000000 -30 $PG
 	runthreads 10 test_brw_read 1000000 -30 $PG
 
-	[ "$PGV" ] && runthreads 10 test_brw_write 100000 -60 $PGV
-	[ "$PGV" ] && runthreads 10 test_brw_read 100000 -60 $PGV
+	[ "$PGVW" ] && runthreads 10 test_brw_write 100000 -60 $PGVW
+	[ "$PGVW" ] && runthreads 1 test_brw_read 1600000 -30 $PG
+	[ "$PGVR" ] && runthreads 10 test_brw_read 100000 -60 $PGVR
 
 	runthreads 32 test_brw_write 1000000 -30 $PG
+	runthreads 1 test_brw_read 16000000 -30 $PG
 	runthreads 32 test_brw_read 1000000 -30 $PG
 
-	[ "$PGV" ] && runthreads 32 test_brw_write 100000 -60 $PGV
-	[ "$PGV" ] && runthreads 32 test_brw_read 100000 -60 $PGV
+	[ "$PGVW" ] && runthreads 32 test_brw_write 100000 -60 $PGVW
+	[ "$PGVW" ] && runthreads 1 test_brw_read 1600000 -30 $PG
+	[ "$PGVR" ] && runthreads 32 test_brw_read 100000 -60 $PGVR
 
 	runthreads 64 test_brw_write 1000000 -30 $PG
+	runthreads 1 test_brw_read 16000000 -30 $PG
 	runthreads 64 test_brw_read 1000000 -30 $PG
 
-	[ "$PGV" ] && runthreads 64 test_brw_write 100000 -60 $PGV
-	[ "$PGV" ] && runthreads 64 test_brw_read 100000 -60 $PGV
+	[ "$PGVW" ] && runthreads 64 test_brw_write 100000 -60 $PGVW
+	[ "$PGVW" ] && runthreads 1 test_brw_read 1600000 -30 $PG
+	[ "$PGVR" ] && runthreads 64 test_brw_read 100000 -60 $PGVR
 
 	runthreads 100 test_brw_write 100000 -60 $PG
+	runthreads 1 test_brw_read 1600000 -30 $PG
 	runthreads 100 test_brw_read 100000 -60 $PG
 
-	[ "$PGV" ] && runthreads 100 test_brw_write 100000 -60 $PGV
-	[ "$PGV" ] && runthreads 100 test_brw_read 100000 -60 $PGV
+	[ "$PGVW" ] && runthreads 100 test_brw_write 100000 -60 $PGVW
+	[ "$PGVW" ] && runthreads 1 test_brw_read 1600000 -30 $PG
+	[ "$PGVR" ] && runthreads 100 test_brw_read 100000 -60 $PGVR
 done
 
 $OBDCTL --device '$OSCDEV' destroy $OID
diff --git a/lustre/tests/runregression-net.sh b/lustre/tests/runregression-net.sh
index e2327b7..f0bbfbb 100644
--- a/lustre/tests/runregression-net.sh
+++ b/lustre/tests/runregression-net.sh
@@ -16,7 +16,7 @@ runthreads() {
 	V=$4
 	PGS=$5
 
-	case $CMD in
+	case $DO in
 	test_getattr)
 		RW=
 		;;
@@ -31,13 +31,13 @@ runthreads() {
 		;;
 	esac
 
+	$OBDCTL --threads $THR v '$OSCDEV' $DO $CNT $RW $V $PGS $OID || exit 1
+
 	if [ -e endrun ]; then
 		rm endrun
 		echo "exiting because endrun file was found"
 		exit 0
 	fi
-
-	$OBDCTL --threads $THR v '$OSCDEV' $DO $CNT $RW $V $PGS $OID || exit 1
 }
 
 setup_server || exit -1
@@ -60,7 +60,10 @@ for CMD in test_getattr test_brw_write test_brw_read; do
 
 	test_brw_read)
 		PG=1
-		#PGV=16 # disabled until the BA OST code is updated
+		case $OSTNODE in
+		ba*) PGV= ;; # disabled until the BA OST code is updated
+		*) PGV=16 ;;
+		esac
 		;;
 	esac