Author: kfujino
Date: Tue Nov 24 06:23:31 2015
New Revision: 1716040
URL: http://svn.apache.org/viewvc?rev=1716040&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/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties?rev=1716040&r1=1716039&r2=1716040&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
Tue Nov 24 06:23:31 2015
@@ -39,7 +39,7 @@ tcpFailureDetector.already.disappeared=V
tcpFailureDetector.member.disappeared=Verification complete. Member
disappeared[{0}]
tcpFailureDetector.still.alive=Verification complete. Member still alive[{0}]
tcpFailureDetector.heartbeat.failed=Unable to perform heartbeat on the
TcpFailureDetector.
-tcpFailureDetector.performBasicCheck.memberAdded=Member added, even though we
werent notified:{0}
+tcpFailureDetector.performBasicCheck.memberAdded=Member added, even though we
weren''t notified:{0}
tcpFailureDetector.suspectMember.dead=Suspect member, confirmed dead.[{0}]
tcpFailureDetector.suspectMember.alive=Suspect member, confirmed alive.[{0}]
tcpFailureDetector.failureDetection.failed=Unable to perform failure detection
check, assuming member down.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=1716040&r1=1716039&r2=1716040&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
Tue Nov 24 06:23:31 2015
@@ -278,6 +278,9 @@ public class TcpFailureDetector extends
Member 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/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1716040&r1=1716039&r2=1716040&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Nov 24 06:23:31 2015
@@ -84,6 +84,19 @@
</add>
</changelog>
</subsection>
+ <subsection name="Tribes">
+ <changelog>
+ <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="jdbc-pool">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
