Author: rjung Date: Wed Jul 1 19:34:58 2009 New Revision: 790339 URL: http://svn.apache.org/viewvc?rev=790339&view=rev Log: BZ 45317: Properly log the value of the state transfer timeout flag.
Backport of r674750 from TC6 and r735630 from OACC. Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=790339&r1=790338&r2=790339&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java (original) +++ tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java Wed Jul 1 19:34:58 2009 @@ -1046,7 +1046,7 @@ cluster.send(msg, mbr); if (log.isWarnEnabled()) log.warn(sm.getString("deltaManager.waitForSessionState", - getName(), mbr)); + 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/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties?rev=790339&r1=790338&r2=790339&view=diff ============================================================================== --- tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties (original) +++ tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties Wed Jul 1 19:34:58 2009 @@ -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/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=790339&r1=790338&r2=790339&view=diff ============================================================================== --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 1 19:34:58 2009 @@ -217,6 +217,11 @@ <subsection name="Cluster"> <changelog> <fix> + <update> + <bug>45317</bug>: Properly log the value of the state transfer timeout flag. + (fhanik, rjung) + </update> + <fix> <bug>45279</bug>: Properly close multicast socket. (fhanik, rjung) </fix> <fix> Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=790339&r1=790338&r2=790339&view=diff ============================================================================== --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 1 19:34:58 2009 @@ -60,13 +60,6 @@ -1: markt - For the common and combined pattern in ALV there is no space between %t and %r For the common and combined pattern in ALV the %r has no opening quote, only the closing quote -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45317 - Properly output the state transfer timeout for sessions. - Backport of http://svn.apache.org/viewvc?view=rev&revision=674750 from tc6 - resp. http://svn.apache.org/viewvc?view=rev&revision=735630 from OACC. - +1: rjung, kkolinko, markt - -1: - * Fix small memory leak found by find bugs. Backport of http://svn.apache.org/viewvc?view=rev&revision=717906 from tc6 resp. http://svn.apache.org/viewvc?view=rev&revision=735645 from OACC. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org