From 87f107b1fd20a34c6c05bf1cd55c732f168a1cda Mon Sep 17 00:00:00 2001
From: shadow <shadow>
Date: Sun, 11 Jan 2009 08:26:18 +0000
Subject: [PATCH] wait until mds<>ost connected. Branch b1_8 b=18150 i=grev

---
 lustre/tests/conf-sanity.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 96743b2..0ae8b9e 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -586,6 +586,9 @@ test_22() {
 
 	echo Client mount with ost in logs, but none running
 	start_ost
+	# wait until mds connected to ost and open client connection
+	# ping_interval + 1
+	sleep $((TIMEOUT / 4 + 1))
 	stop_ost
 	mount_client $MOUNT
 	# check_mount will block trying to contact ost
@@ -1544,7 +1547,8 @@ test_46a() {
 	start ost4 `ostdevname 4` $OST_MOUNT_OPTS || return 6
 	start ost5 `ostdevname 5` $OST_MOUNT_OPTS || return 7
 	# wait until ost2-5 is sync
-	sleep 5
+	# ping_interval + 1
+	sleep $((TIMEOUT / 4 + 1))
 	#second client see both ost's
 
 	mount_client $MOUNT2 || return 8
-- 
1.8.3.1