liblustre:

  - remove the hack code for timeout, now use env to set obd timeout value.

diff --git a/lustre/liblustre/tests/recovery_small.c b/lustre/liblustre/tests/recovery_small.c
index b1292c2..5aed06c 100644 (file)
--- a/lustre/liblustre/tests/recovery_small.c
+++ b/lustre/liblustre/tests/recovery_small.c
@@ -353,6 +353,8 @@ int main(int argc, char * argv[])
                 exit(-1);
         }
 
+        setenv(ENV_LUSTRE_TIMEOUT, "10", 1);
+
         __liblustre_setup_();
 
         while (drop_arr[drop_index].name) {

diff --git a/lustre/liblustre/tests/replay_single.c b/lustre/liblustre/tests/replay_single.c
index 1602a7c..6645056 100644 (file)
--- a/lustre/liblustre/tests/replay_single.c
+++ b/lustre/liblustre/tests/replay_single.c
@@ -384,6 +384,8 @@ int main(int argc, char * const argv[])
         sprintf(barrier_cmd, "ssh %s \"%s\"", mds_server, barrier_script);
         sprintf(failover_cmd, "ssh %s \"%s\"", mds_server, failover_script);
 
+        setenv(ENV_LUSTRE_TIMEOUT, "10", 1);
+
         __liblustre_setup_();
 
         t0();

diff --git a/lustre/liblustre/tests/test_common.h b/lustre/liblustre/tests/test_common.h
index 91d9906..9d537cc 100644 (file)
--- a/lustre/liblustre/tests/test_common.h
+++ b/lustre/liblustre/tests/test_common.h
@@ -3,6 +3,7 @@
 
 #define ENV_LUSTRE_MNTPNT               "LIBLUSTRE_MOUNT_POINT"
 #define ENV_LUSTRE_MNTTGT               "LIBLUSTRE_MOUNT_TARGET"
+#define ENV_LUSTRE_TIMEOUT              "LIBLUSTRE_TIMEOUT"
 #define ENV_LUSTRE_DUMPFILE             "LIBLUSTRE_DUMPFILE"
 
 extern int exit_on_err;