Branch b1_6

Disable Adaptive Timeouts by default. Can be re-enabled by setting the ptlrpc
module parameter "at_max=600".

b=3055
i=adilger
i=nathan

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 7e0f3b8..b1f2fa8 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -18,6 +18,10 @@ tbd  Sun Microsystems, Inc.
        * RHEL 4 and RHEL 5/SLES 10 clients behaves differently on 'cd' to a
         removed cwd "./" (refer to Bugzilla 14399).
 
+Severity   : normal
+Bugzilla   : 3055
+Description: Disable adaptive timeouts by default
+
 Severity   : major
 Bugzilla   : 15027
 Frequency  : on network error

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 893f152..2437b56 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -1245,6 +1245,7 @@ AC_DEFUN([LC_PROG_LINUX],
           LC_CONFIG_QUOTA
           LC_CONFIG_HEALTH_CHECK_WRITE
           LC_CONFIG_LRU_RESIZE
+          LC_CONFIG_ADAPTIVE_TIMEOUTS
 
           LC_TASK_PPTR
           # RHEL4 patches
@@ -1410,6 +1411,18 @@ if test x$enable_lru_resize != xno; then
 fi
 ])
 
+AC_DEFUN([LC_CONFIG_ADAPTIVE_TIMEOUTS],
+[AC_MSG_CHECKING([whether to enable ptlrpc adaptive timeouts support])
+AC_ARG_ENABLE([adaptive_timeouts],
+       AC_HELP_STRING([--enable-adaptive-timeouts],
+                       [enable ptlrpc adaptive timeouts support]),
+       [],[enable_adaptive_timeouts='no'])
+AC_MSG_RESULT([$enable_adaptive_timeouts])
+if test x$enable_adaptive_timeouts == xyes; then
+   AC_DEFINE(HAVE_AT_SUPPORT, 1, [Enable adaptive timeouts support])
+fi
+])
+
 #
 # LC_CONFIG_QUOTA
 #

diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index a72957e..5b2ff8e 100644 (file)
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -41,7 +41,13 @@ CFS_MODULE_PARM(test_req_buffer_pressure, "i", int, 0444,
 unsigned int at_min = 0;
 CFS_MODULE_PARM(at_min, "i", int, 0644,
                 "Adaptive timeout minimum (sec)");
+
+#if HAVE_AT_SUPPORT
 unsigned int at_max = 600;
+#else
+unsigned int at_max = 0;
+#endif
+
 EXPORT_SYMBOL(at_max);
 CFS_MODULE_PARM(at_max, "i", int, 0644,
                 "Adaptive timeout maximum (sec)");