Fix for bug 45317, document and properly output the session timeout time

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@673487 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java
index 0e46482..c6f3aec 100644 (file)
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -880,7 +880,7 @@ public class DeltaManager extends ClusterManagerBase{
                      receiverQueue = true ;
                 }
                 cluster.send(msg, mbr);
-                if (log.isWarnEnabled()) log.warn(sm.getString("deltaManager.waitForSessionState",getName(), mbr));
+                if (log.isWarnEnabled()) log.warn(sm.getString("deltaManager.waitForSessionState",getName(), mbr,getStateTransferTimeout()));
                 // FIXME At sender ack mode this method check only the state transfer and resend is a problem!
                 waitForSendAllSessions(beforeSendTime);
             } finally {

diff --git a/java/org/apache/catalina/ha/session/LocalStrings.properties b/java/org/apache/catalina/ha/session/LocalStrings.properties
index 18d222a..9d513f1 100644 (file)
--- a/java/org/apache/catalina/ha/session/LocalStrings.properties
+++ b/java/org/apache/catalina/ha/session/LocalStrings.properties
@@ -55,7 +55,7 @@ deltaManager.sessionTimeout=Invalid session timeout setting {0}
 deltaManager.startClustering=Starting clustering manager at {0}
 deltaManager.stopped=Manager [{0}] is stopping
 deltaManager.unloading.ioe=IOException while saving persisted sessions: {0}
-deltaManager.waitForSessionState=Manager [{0}], requesting session state from {1}. This operation will timeout if no session state has been received within 60 seconds.
+deltaManager.waitForSessionState=Manager [{0}], requesting session state from {1}. This operation will timeout if no session state has been received within {2} seconds.
 deltaRequest.showPrincipal=Principal [{0}] is set to session {1}
 deltaRequest.wrongPrincipalClass=DeltaManager only support GenericPrincipal. Your realm used principal class {0}.
 deltaSession.notifying=Notifying cluster of expiration primary={0} sessionId [{1}]

diff --git a/webapps/docs/config/cluster-manager.xml b/webapps/docs/config/cluster-manager.xml
index 1181098..5483076 100644 (file)
--- a/webapps/docs/config/cluster-manager.xml
+++ b/webapps/docs/config/cluster-manager.xml
@@ -97,6 +97,11 @@
        a shutdown occurs on one node, set this value to <code>true</code>.
        Default value is <code>false</code>.
      </attribute>
+     <attribute name="stateTransferTimeout" required="false">
+       The time in seconds to wait for a session state transfer to complete from another node
+       when a node is starting up.
+       Default value is <code>60</code> seconds.
+     </attribute>
     </attributes>
   </subsection>
   <subsection name="org.apache.catalina.ha.session.BackupManager Attributes">