From: shadow <shadow>
Date: Sun, 11 Jan 2009 08:27:30 +0000 (+0000)
Subject: wait until mds<>ost connected.
X-Git-Tag: v1_6_7~25
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=d5be27bd7c23c12130b0419aa555a92597886c0a;p=fs%2Flustre-release.git

wait until mds<>ost connected.
Branch b_release_1_6_7
b=18150
i=grev
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index e2f8d99..1e65b9e 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
@@ -1505,7 +1508,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