From 77cce014f668908da2443b27e9a9fdfe90eb7b64 Mon Sep 17 00:00:00 2001
From: shadow <shadow>
Date: Fri, 1 May 2009 11:42:55 +0000
Subject: [PATCH] set notransno before readonly.

Branch b1_6
b=19085
i=rread
i=adilger
---
 lustre/tests/replay-single.sh  | 23 +++++++++++++++++------
 lustre/tests/test-framework.sh |  4 ++--
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 2aabe1c..73a0ae3 100755
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -1768,7 +1768,7 @@ test_70b () {
 
 	zconf_mount_clients $clients $DIR
 	
-	local duration=120
+	local duration=300
 	[ "$SLOW" = "no" ] && duration=60
 	local cmd="rundbench 1 -t $duration"
 	local PID=""
@@ -1779,12 +1779,23 @@ test_70b () {
 	PID=$!
 	log "Started rundbench load PID=$PID ..."
 
-	sleep $((duration / 4))
-	replay_barrier mds 
-	sleep 3 # give clients a time to do operations
+	ELAPSED=0
+	NUM_FAILOVERS=0
+	START_TS=$(date +%s)
+	CURRENT_TS=$START_TS
+	while [ $ELAPSED -lt $duration ]; do
+		sleep 1
+		replay_barrier mds
+		sleep 1 # give clients a time to do operations
+		# Increment the number of failovers
+		NUM_FAILOVERS=$((NUM_FAILOVERS+1))
+		log "$TESTNAME fail mds1 $NUM_FAILOVERS times"
+		facet_failover mds
+		CURRENT_TS=$(date +%s)
+		ELAPSED=$((CURRENT_TS - START_TS))
+	done
 
-	log "$TESTNAME fail mds 1"
-	fail mds
+	wait $PID || error "rundbench load on $CLIENTS failed!"
 
 	wait $PID || error "rundbench load on $CLIENTS failed!"
 
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index fdb38a7..f8670ad 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -993,8 +993,8 @@ replay_barrier() {
     do_facet $facet sync
     df $MOUNT
     local svc=${facet}_svc
-    do_facet $facet $LCTL --device %${!svc} readonly
     do_facet $facet $LCTL --device %${!svc} notransno
+    do_facet $facet $LCTL --device %${!svc} readonly
     do_facet $facet $LCTL mark "$facet REPLAY BARRIER on ${!svc}"
     $LCTL mark "local REPLAY BARRIER on ${!svc}"
 }
@@ -1004,8 +1004,8 @@ replay_barrier_nodf() {
     do_facet $facet sync
     local svc=${facet}_svc
     echo Replay barrier on ${!svc}
-    do_facet $facet $LCTL --device %${!svc} readonly
     do_facet $facet $LCTL --device %${!svc} notransno
+    do_facet $facet $LCTL --device %${!svc} readonly
     do_facet $facet $LCTL mark "$facet REPLAY BARRIER on ${!svc}"
     $LCTL mark "local REPLAY BARRIER on ${!svc}"
 }
-- 
1.8.3.1