Branch b1_4

Increase the LDLM AST timeout.  With the lock reordering in bug 5492 et.al.
we now hold ns_lock over vmtruncate.
b=6172
r=phil

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index d22d922..9b14c6c 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -1,4 +1,9 @@
 tbd         Cluster File Systems, Inc. <info@clusterfs.com>
+       * version 1.4.3
+       * bug fixes
+       - increase ldlm_timeout to avoid timeouts for long truncates (6172)
+
+2005-05-10  Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.4.2
        NOTE: Lustre 1.4.2 uses an incompatible network protocol than previous
             versions of Lustre.  Please update all servers and clients to

diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index 3d248c6..2f92595 100644 (file)
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -89,7 +89,7 @@ int proc_version;
 unsigned int obd_fail_loc;
 unsigned int obd_dump_on_timeout;
 unsigned int obd_timeout = 100; /* seconds */
-unsigned int ldlm_timeout = 6;  /* seconds */
+unsigned int ldlm_timeout = 30; /* seconds */
 char obd_lustre_upcall[128] = "DEFAULT"; /* or NONE or /full/path/to/upcall  */
 unsigned int obd_sync_filter; /* = 0, don't sync by default */