From fc04968d4c0c368bad0bc3b24a6407df9f53a673 Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Tue, 28 Jul 2009 16:28:54 +0000
Subject: [PATCH] b=19887 i=Nathan test_26b: increase wait client evicted value

---
 lustre/tests/recovery-small.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index 5b09a2e..59fc92f 100755
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -692,16 +692,19 @@ test_26b() {      # bug 10140 - evict dead exports by pinger
 
 	zconf_umount `hostname` $MOUNT2 -f
 
+	# PING_INTERVAL max(obd_timeout / 4, 1U)
+	# PING_EVICT_TIMEOUT (PING_INTERVAL * 6)
+
 	# evictor takes PING_EVICT_TIMEOUT + 3 * PING_INTERVAL to evict.  
 	# But if there's a race to start the evictor from various obds, 
 	# the loser might have to wait for the next ping.
-	# PING_INTERVAL max(obd_timeout / 4, 1U)
-	# sleep (2*PING_INTERVAL) 
-
-        local rc=0
-        wait_client_evicted ost1 $OST_NEXP $((TIMEOUT * 2 + TIMEOUT * 3 / 4)) || \
+	# = 9 * PING_INTERVAL + PING_INTERVAL
+	# = 10 PING_INTERVAL = 10 obd_timeout / 4 = 2.5 obd_timeout
+	# let's wait $((TIMEOUT * 3)) # bug 19887
+	local rc=0
+	wait_client_evicted ost1 $OST_NEXP $((TIMEOUT * 3)) || \
 		error "Client was not evicted by ost" rc=1
-	wait_client_evicted $SINGLEMDS $MDS_NEXP $((TIMEOUT * 2 + TIMEOUT * 3 / 4)) || \
+	wait_client_evicted $SINGLEMDS $MDS_NEXP $((TIMEOUT * 3)) || \
 		error "Client was not evicted by mds"
 }
 run_test 26b "evict dead exports"
-- 
1.8.3.1