Author: rjung
Date: Mon Mar 23 23:01:31 2009
New Revision: 757582
URL: http://svn.apache.org/viewvc?rev=757582&view=rev
Log:
Any cluster node should ignore its own heartbeat messages.
Backport of r755302.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=757582&r1=757581&r2=757582&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Mar 23 23:01:31 2009
@@ -113,8 +113,3 @@
Align mbean with implementation
+1: markt, billbarker, rjung
-1:
-
-* Fix use of setLoopbackMode() for tribes multicast.
- Backport of http://svn.apache.org/viewvc?rev=755302&view=rev
- +1: rjung, fhanik, pero
- -1:
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=757582&r1=757581&r2=757582&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Mon Mar 23 23:01:31 2009
@@ -199,7 +199,7 @@
} else {
socket = new MulticastSocket(port);
}
- socket.setLoopbackMode(false); //hint that we don't need loop back
messages
+ socket.setLoopbackMode(true); //hint that we don't need loop back
messages
if (mcastBindAddress != null) {
if(log.isInfoEnabled())
log.info("Setting multihome multicast interface to:"
+mcastBindAddress);
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=757582&r1=757581&r2=757582&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Mar 23 23:01:31 2009
@@ -41,6 +41,13 @@
</update>
</changelog>
</subsection>
+ <subsection name="Cluster">
+ <changelog>
+ <fix>
+ A node should ignore its own heartbeat messages. (rjung)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Webapps">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
