Author: markt
Date: Sat Jan 15 14:47:07 2011
New Revision: 1059346
URL: http://svn.apache.org/viewvc?rev=1059346&view=rev
Log:
Fix broken cluster membership recovery
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/cluster-membership.xml
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1059346&r1=1059345&r2=1059346&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Sat Jan 15 14:47:07 2011
@@ -547,7 +547,7 @@ public class McastServiceImpl
try { Thread.sleep(500); } catch ( Exception
ignore ){}
if ( (++errorCounter)>=recoveryCounter ) {
errorCounter=0;
- new RecoveryThread(McastServiceImpl.this);
+ new
RecoveryThread(McastServiceImpl.this).start();
}
}
}
@@ -575,7 +575,7 @@ public class McastServiceImpl
else log.debug("Unable to send mcast message.",x);
if ( (++errorCounter)>=recoveryCounter ) {
errorCounter=0;
- new RecoveryThread(McastServiceImpl.this);
+ new RecoveryThread(McastServiceImpl.this).start();
}
}
try { Thread.sleep(time); } catch ( Exception ignore ) {}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1059346&r1=1059345&r2=1059346&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Jan 15 14:47:07 2011
@@ -83,6 +83,11 @@
<add>
Internationalise the log messages for the FarmWarDeployer. (markt)
</add>
+ <fix>
+ The recovery feature of the default cluster membership service can now
+ be enabled. Previously it any configuration settings for it were
+ ignored. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
Modified: tomcat/trunk/webapps/docs/config/cluster-membership.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-membership.xml?rev=1059346&r1=1059345&r2=1059346&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/cluster-membership.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-membership.xml Sat Jan 15 14:47:07
2011
@@ -138,8 +138,9 @@
</attribute>
<attribute name="recoveryCounter" required="false">
<p>
- When <code>recoveryEnabled==true</code> this value indicates how many
times we will try recovery.
- The default is <code>10</code>. <br/>
+ When <code>recoveryEnabled==true</code> this value indicates how many
+ times an error has to occur before recovery is attempted. The default is
+ <code>10</code>. <br/>
</p>
</attribute>
<attribute name="recoverySleepTime" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
