Author: kfujino Date: Thu Jan 12 09:30:15 2017 New Revision: 1778407 URL: http://svn.apache.org/viewvc?rev=1778407&view=rev Log: -Add log message that PING message has received beyond the timeout period. -When a PING message that beyond the time-out period has been received, make sure that valid member is added to the map membership.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1778407&r1=1778406&r2=1778407&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Thu Jan 12 09:30:15 2017 @@ -621,9 +621,18 @@ public abstract class AbstractReplicated mapmsg.deserialize(getExternalLoaders()); if (mapmsg.getMsgType() == MapMessage.MSG_START) { mapMemberAdded(mapmsg.getPrimary()); - } else if (mapmsg.getMsgType() == MapMessage.MSG_INIT - || mapmsg.getMsgType() == MapMessage.MSG_PING) { + } else if (mapmsg.getMsgType() == MapMessage.MSG_INIT) { memberAlive(mapmsg.getPrimary()); + } else if (mapmsg.getMsgType() == MapMessage.MSG_PING) { + Member member = mapmsg.getPrimary(); + if (log.isInfoEnabled()) + log.info("PING message has been received beyond the timeout period. " + + "The map member[" + member + + "] might have been removed from the map membership."); + State state = (State) mapmsg.getValue(); + if (state.isAvailable()) { + memberAlive(member); + } } else { // other messages are ignored. if (log.isInfoEnabled()) Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1778407&r1=1778406&r2=1778407&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jan 12 09:30:15 2017 @@ -192,6 +192,14 @@ Reduce the warning logs for a message received from a different domain in order to avoid excessive log outputs. (kfujino) </fix> + <add> + Add log message that PING message has received beyond the timeout + period. (kfujino) + </add> + <fix> + When a PING message that beyond the time-out period has been received, + make sure that valid member is added to the map membership. (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