Author: kfujino
Date: Tue Jun 5 07:32:13 2018
New Revision: 1832914
URL: http://svn.apache.org/viewvc?rev=1832914&view=rev
Log:
When sending the GET_ALL_SESSIONS message, make sure that sends with
asynchronous option in order to avoid ack timeout.
Waiting to receive the ALL_SESSION_DATA message should be done with
waitForSendAllSessions instead of ACK.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1832914&r1=1832913&r2=1832914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Tue Jun
5 07:32:13 2018
@@ -747,7 +747,7 @@ public class DeltaManager extends Cluste
synchronized(receivedMessageQueue) {
receiverQueue = true ;
}
- cluster.send(msg, mbr);
+ cluster.send(msg, mbr, Channel.SEND_OPTIONS_ASYNCHRONOUS);
if (log.isInfoEnabled())
log.info(sm.getString("deltaManager.waitForSessionState",
getName(), mbr,
Integer.valueOf(getStateTransferTimeout())));
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1832914&r1=1832913&r2=1832914&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jun 5 07:32:13 2018
@@ -238,6 +238,12 @@
<add>
Add the method to send a message with a specified sendOptions.
(kfujino)
</add>
+ <fix>
+ When sending the <code>GET_ALL_SESSIONS</code> message, make sure that
+ sends with asynchronous option in order to avoid ack timeout. Waiting
to
+ receive the <code>ALL_SESSION_DATA</code> message should be done with
+ <code>waitForSendAllSessions</code> instead of ACK. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
