Author: kfujino
Date: Tue Nov 24 06:25:37 2015
New Revision: 1716041
URL: http://svn.apache.org/viewvc?rev=1716041&view=rev
Log:
-Ensure that the static member is registered to the add suspect list even If
the static member that is registered to the remove suspect list has disappeared.
-Correct the warnnig log of when the member that is not registered in the
membership is detected.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=1716041&r1=1716040&r2=1716041&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
Tue Nov 24 06:25:37 2015
@@ -265,7 +265,7 @@ public class TcpFailureDetector extends
if (membership.memberAlive( (MemberImpl) members[i])) {
//we don't have this one in our membership, check to see if
he/she is alive
if (memberAlive(members[i])) {
- log.warn("Member added, even though we werent notified:" +
members[i]);
+ log.warn("Member added, even though we weren't notified:"
+ members[i]);
super.memberAdded(members[i]);
} else {
membership.removeMember( (MemberImpl) members[i]);
@@ -280,6 +280,9 @@ public class TcpFailureDetector extends
MemberImpl m = keys[i];
if (membership.getMember(m) != null && (!memberAlive(m))) {
membership.removeMember(m);
+ if (m instanceof StaticMember) {
+ addSuspects.put(m,
Long.valueOf(System.currentTimeMillis()));
+ }
super.memberDisappeared(m);
removeSuspects.remove(m);
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=1716041&r1=1716040&r2=1716041&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Nov 24 06:25:37 2015
@@ -217,6 +217,15 @@
Interceptors. If the required Interceptor does not exist, it issues
warning logs. (kfujino)
</fix>
+ <fix>
+ Ensure that the static member is registered to the add suspect list
even
+ if the static member that is registered to the remove suspect list has
+ disappeared. (kfujino)
+ </fix>
+ <fix>
+ Correct the warnnig log of when the member that is not registered in
the
+ membership is detected. (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
