Author: kfujino
Date: Tue Jan 17 08:41:46 2017
New Revision: 1779153
URL: http://svn.apache.org/viewvc?rev=1779153&view=rev
Log:
Make the accessTimeout configurable in BackupManager.
The accessTimeout is used as a timeout period for PING in replication map.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-manager.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=1779153&r1=1779152&r2=1779153&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
Tue Jan 17 08:41:46 2017
@@ -77,6 +77,11 @@ public class BackupManager extends Clust
private boolean terminateOnStartFailure = false;
/**
+ * The timeout for a ping message in replication map.
+ */
+ private long accessTimeout = 5000;
+
+ /**
* Constructor, just calls super()
*
*/
@@ -172,6 +177,7 @@ public class BackupManager extends Clust
cluster.getChannel(), rpcTimeout, getMapName(),
getClassLoaders(), terminateOnStartFailure);
map.setChannelSendOptions(mapSendOptions);
+ map.setAccessTimeout(accessTimeout);
this.sessions = map;
} catch ( Exception x ) {
log.error(sm.getString("backupManager.startUnable", getName()),x);
@@ -243,6 +249,14 @@ public class BackupManager extends Clust
return terminateOnStartFailure;
}
+ public long getAccessTimeout() {
+ return accessTimeout;
+ }
+
+ public void setAccessTimeout(long accessTimeout) {
+ this.accessTimeout = accessTimeout;
+ }
+
@Override
public String[] getInvalidatedSessions() {
return new String[0];
@@ -256,6 +270,7 @@ public class BackupManager extends Clust
result.mapSendOptions = mapSendOptions;
result.rpcTimeout = rpcTimeout;
result.terminateOnStartFailure = terminateOnStartFailure;
+ result.accessTimeout = accessTimeout;
return result;
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1779153&r1=1779152&r2=1779153&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
Tue Jan 17 08:41:46 2017
@@ -592,6 +592,10 @@
name="warnOnSessionAttributeFilterFailure"
description="Should a WARN level log message be generated if a session
attribute fails to match sessionAttributeNameFilter or
sessionAttributeClassNameFilter?"
type="boolean"/>
+ <attribute
+ name="accessTimeout"
+ description="The timeout for a ping message in replication map."
+ type="long"/>
<operation
name="expireSession"
description="Expired the given session"
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=1779153&r1=1779152&r2=1779153&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jan 17 08:41:46 2017
@@ -58,6 +58,15 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 7.0.75 (violetagg)">
+ <subsection name="Cluster">
+ <changelog>
+ <add>
+ Make the <code>accessTimeout</code> configurable in
+ <code>BackupManager</code>. The <code>accessTimeout</code> is used as a
+ timeout period for PING in replication map. (kfujino)
+ </add>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.74 (violetagg)">
<subsection name="Catalina">
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-manager.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-manager.xml?rev=1779153&r1=1779152&r2=1779153&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-manager.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-manager.xml Tue Jan 17
08:41:46 2017
@@ -290,6 +290,11 @@
<code>false</code> unless a <code>SecurityManager</code> is enabled in
which case the default will be <code>true</code>.</p>
</attribute>
+ <attribute name="accessTimeout" required="false">
+ The timeout for a ping message. If a remote map does not respond within
+ this timeout period, its regarded as disappeared.
+ Default value is <code>5000</code> milliseconds.
+ </attribute>
</attributes>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
