From: Elena Gryaznova <grev@sun.com>
Date: Fri, 26 Feb 2010 19:12:28 +0000 (+0300)
Subject: b=18649 set wait_recovery_complete() MAX value to max recovery time estimated
X-Git-Tag: v1_8_2_52~35
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=790423c504019f5996237c80b4a28f7a18c3252f;p=fs%2Flustre-release.git

b=18649 set wait_recovery_complete() MAX value to max recovery time estimated

i=Mikhail.Pershin
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 93a175b..5def868 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -965,10 +965,7 @@ wait_recovery_complete () {
     local facet=$1
 
     # Use default policy if $2 is not passed by caller.
-    #define OBD_RECOVERY_TIMEOUT (obd_timeout * 5 / 2)
-    # as we are in process of changing obd_timeout in different ways
-    # let's set MAX longer than that
-    local MAX=${2:-$(( TIMEOUT * 4 ))}
+    local MAX=${2:-$(max_recovery_time)}
 
     local var_svc=${facet}_svc
     local procfile="*.${!var_svc}.recovery_status"