From: Elena Gryaznova <grev@sun.com>
Date: Mon, 11 Oct 2010 14:13:40 +0000 (+0400)
Subject: bug=23542 recovery-small: test_27 is not time bounded
X-Git-Tag: 2.0.54.0~38
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=de311fb7aaf8c6fdeb2e6135e98535bb75467940

bug=23542 recovery-small: test_27 is not time bounded

i=Brian.Murrell
---

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index 3431fc8..a439a01 100755
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-#         bug  5494 7288 5493
-ALWAYS_EXCEPT="24   27   52 $RECOVERY_SMALL_EXCEPT"
+#         bug  5494 5493
+ALWAYS_EXCEPT="24   52 $RECOVERY_SMALL_EXCEPT"
 
 PTLDEBUG=${PTLDEBUG:--1}
 LUSTRE=${LUSTRE:-`dirname $0`/..}
@@ -725,12 +725,8 @@ test_27() {
 #define OBD_FAIL_OSC_SHUTDOWN            0x407
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000407
 	# need to wait for reconnect
-	echo -n waiting for fail_loc
-	while [ $(do_facet $SINGLEMDS lctl get_param -n fail_loc) -eq -2147482617 ]; do
-	    sleep 1
-	    echo -n .
-	done
-	do_facet $SINGLEMDS lctl get_param -n fail_loc
+	echo waiting for fail_loc
+	wait_update_facet $SINGLEMDS "lctl get_param -n fail_loc" "-2147482617"
 	facet_failover $SINGLEMDS
 	#no crashes allowed!
         kill -USR1 $CLIENT_PID