tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r674750 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/ha/session/DeltaManager.java java/org/apache/catalina/ha/session/LocalStrings.properties webapps/docs/changelog.xml webapps/docs/config/cluster-manager.xml
Date Tue, 08 Jul 2008 09:45:43 GMT
Author: fhanik
Date: Tue Jul  8 02:45:42 2008
New Revision: 674750

URL: http://svn.apache.org/viewvc?rev=674750&view=rev
Log:
fix for bug
https://issues.apache.org/bugzilla/show_bug.cgi?id=45317

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
    tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-manager.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=674750&r1=674749&r2=674750&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul  8 02:45:42 2008
@@ -42,12 +42,6 @@
              and seems impossible to anticipate):
              https://issues.apache.org/bugzilla/show_bug.cgi?id=36155#c17
 
-* Fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45317
-  http://svn.apache.org/viewvc?rev=673487&view=rev
-  Properly document and print out the value of the state transfer timeout setting
-  +1: fhanik, markt, yoavs
-  -1: 
-
 * Add in startup options, so that cluster can be started in TCP mode only, when using static
membership
   Also document the multicast recovery options
   http://svn.apache.org/viewvc?rev=674125&view=rev

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=674750&r1=674749&r2=674750&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Tue Jul  8
02:45:42 2008
@@ -880,7 +880,7 @@
                      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 {

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=674750&r1=674749&r2=674750&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties Tue Jul
 8 02:45:42 2008
@@ -55,7 +55,7 @@
 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}]

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=674750&r1=674749&r2=674750&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jul  8 02:45:42 2008
@@ -41,6 +41,13 @@
       </update>
     </changelog>
   </subsection>
+  <subsection name="Cluster">
+    <changelog>
+      <update>
+        <bug>45317</bug>: Properly document and log the value of the state transfer
timeout flag (fhanik)
+      </update>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 6.0.17 (remm)">
   <subsection name="General">

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-manager.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-manager.xml?rev=674750&r1=674749&r2=674750&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-manager.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-manager.xml Tue Jul  8 02:45:42 2008
@@ -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">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message