From: grev <grev>
Date: Tue, 1 Dec 2009 11:07:28 +0000 (+0000)
Subject: b=21265
X-Git-Tag: GIT_EPOCH_B_HD_KDMU~46
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=d721e68a4f81dd3e74084eae4d2a32bdacffb40b;p=fs%2Flustre-release.git

b=21265
i=Robert.Read
skip last sleep if ELAPSED + sleep > DURATION
---

diff --git a/lustre/tests/recovery-mds-scale.sh b/lustre/tests/recovery-mds-scale.sh
index 675988c..d4867f5 100644
--- a/lustre/tests/recovery-mds-scale.sh
+++ b/lustre/tests/recovery-mds-scale.sh
@@ -266,6 +266,11 @@ Failed to meet interval $reqfail times ( REQFAIL=$REQFAIL ); have sleep=$sleep"
     fi  
 
     log "$SERVERFACET has failed over ${!var} times, and counting..."
+
+    if [ $((ELAPSED + sleep)) -gt $DURATION ]; then
+         break
+    fi
+
     if [ $sleep -gt 0 ]; then 
         echo "sleeping $sleep seconds ... "
         sleep $sleep
diff --git a/lustre/tests/recovery-random-scale.sh b/lustre/tests/recovery-random-scale.sh
index dfde69a..878e594 100644
--- a/lustre/tests/recovery-random-scale.sh
+++ b/lustre/tests/recovery-random-scale.sh
@@ -294,6 +294,10 @@ Failed to meet interval $reqfail times ( REQFAIL=$REQFAIL ); have sleep=$sleep"
     log " Number of failovers:
 $(numfailovers)                and counting..."
 
+    if [ $((ELAPSED + sleep)) -gt $DURATION ]; then
+         break
+    fi
+
     if [ $sleep -gt 0 ]; then 
         echo "sleeping $sleep seconds ... "
         sleep $sleep