From ebee985b34dcbef204bc7fd609da9a525467ce67 Mon Sep 17 00:00:00 2001
From: Ryan Haasken <haasken@cray.com>
Date: Mon, 7 Jul 2014 10:40:16 -0500
Subject: [PATCH] LUDOC-247 mount: Clarify recovery_time_{soft,hard} defaults

It was not clear that the recovery_time_{soft,hard} default values
depended on the RPC timeout value at mount time.  The descriptions of
the default values of these recovery times were clarified.  Links were
added from the recovery_time_{soft,hard} descriptions to the section
which describes the RPC timeout.

Signed-off-by: Ryan Haasken <haasken@cray.com>
Change-Id: Iecf2814fb62e7bedff79873bbd802fc27277aafa
Reviewed-on: http://review.whamcloud.com/11885
Tested-by: Jenkins
Reviewed-by: Chris Horn <hornc@cray.com>
Reviewed-by: Richard Henwood <richard.henwood@intel.com>
---
 SystemConfigurationUtilities.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/SystemConfigurationUtilities.xml b/SystemConfigurationUtilities.xml
index 094854b..bd11b10 100644
--- a/SystemConfigurationUtilities.xml
+++ b/SystemConfigurationUtilities.xml
@@ -2052,7 +2052,8 @@ mount.lustre</title>
                 <para> <literal>recovery_time_soft=<replaceable>timeout</replaceable></literal></para>
               </entry>
               <entry>
-                <para>  Allows <literal>timeout</literal> seconds for clients to reconnect for recovery after a server crash. This timeout is incrementally extended if it is about to expire and the server is still handling new connections from recoverable clients. The default soft recovery timeout is 300 seconds (5 minutes).</para>
+                <para>  Allows <literal>timeout</literal> seconds for clients to reconnect for recovery after a server crash. This timeout is incrementally extended if it is about to expire and the server is still handling new connections from recoverable clients.</para>
+		<para>  The default soft recovery timeout is 3 times the value of the Lustre timeout parameter (see <xref linkend="section_c24_nt5_dl"/>). The default Lustre timeout is 100 seconds, which would make the soft recovery timeout default to 300 seconds (5 minutes). The soft recovery timeout is set at mount time and will not change if the Lustre timeout is changed after mount time.</para>
               </entry>
             </row>
             <row>
@@ -2060,7 +2061,8 @@ mount.lustre</title>
                 <para> <literal>recovery_time_hard=<replaceable>timeout</replaceable></literal></para>
               </entry>
               <entry>
-                <para>  The server is allowed to incrementally extend its timeout up to a hard maximum of <literal>timeout</literal> seconds. The default hard recovery timeout is set to 900 seconds (15 minutes).</para>
+                <para>  The server is allowed to incrementally extend its timeout up to a hard maximum of <literal>timeout</literal> seconds.</para>
+		<para>  The default hard recovery timeout is 9 times the value of the Lustre timeout parameter (see <xref linkend="section_c24_nt5_dl"/>). The default Lustre timeout is 100 seconds, which would make the hard recovery timeout default to 900 seconds (15 minutes). The hard recovery timeout is set at mount time and will not change if the Lustre timeout is changed after mount time.</para>
               </entry>
             </row>
             <row>
-- 
1.8.3.1