You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/02/15 21:26:35 UTC
svn commit: r1446758 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt
java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
webapps/docs/changelog.xml
Author: markt
Date: Fri Feb 15 20:26:34 2013
New Revision: 1446758
URL: http://svn.apache.org/r1446758
Log:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54045.
Make sure getMembers() returns available member when TcpFailureDetector works in static cluster.
Patch by kfujino
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/tc7.0.x/trunk:r1402110
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1446758&r1=1446757&r2=1446758&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Feb 15 20:26:34 2013
@@ -61,13 +61,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54045.
- Make sure getMembers() returns available member when TcpFailureDetector works
- in static cluster.
- http://svn.apache.org/viewvc?view=revision&revision=1402110
- +1: kfujino, kkolinko, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54044
Correct bug in timestamp cache used by org.apache.juli.OneLineFormatter
that meant entries could be made with an earlier timestamp than the true timestamp.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=1446758&r1=1446757&r2=1446758&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java Fri Feb 15 20:26:34 2013
@@ -35,6 +35,7 @@ import org.apache.catalina.tribes.io.Cha
import org.apache.catalina.tribes.io.XByteBuffer;
import org.apache.catalina.tribes.membership.MemberImpl;
import org.apache.catalina.tribes.membership.Membership;
+import org.apache.catalina.tribes.membership.StaticMember;
/**
* <p>Title: A perfect failure detector </p>
@@ -152,6 +153,9 @@ public class TcpFailureDetector extends
//not correct, we need to maintain the map
membership.removeMember( (MemberImpl) member);
removeSuspects.remove(member);
+ if (member instanceof StaticMember) {
+ addSuspects.put(member, Long.valueOf(System.currentTimeMillis()));
+ }
notify = true;
} else {
//add the member as suspect
@@ -218,7 +222,11 @@ public class TcpFailureDetector extends
if (membership.getMember(members[i])!=null) {
membership.removeMember((MemberImpl)members[i]);
removeSuspects.remove(members[i]);
- super.memberDisappeared((MemberImpl)members[i]);
+ if (members[i] instanceof StaticMember) {
+ addSuspects.put(members[i],
+ Long.valueOf(System.currentTimeMillis()));
+ }
+ super.memberDisappeared(members[i]);
}
} //end if
} //for
@@ -229,6 +237,10 @@ public class TcpFailureDetector extends
//update all alive times
Member[] members = super.getMembers();
for (int i = 0; members != null && i < members.length; i++) {
+ if (addSuspects.containsKey(members[i]) && membership.getMember(members[i]) == null) {
+ // avoid temporary adding member.
+ continue;
+ }
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])) {
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1446758&r1=1446757&r2=1446758&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Feb 15 20:26:34 2013
@@ -88,6 +88,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Cluster">
+ <changelog>
+ <fix>
+ <bug>54045</bug>: Make sure getMembers() returns available member when
+ TcpFailureDetector works in static cluster. (kfujino)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Web applications">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org