Author: stefanegli
Date: Wed Mar 5 13:04:45 2014
New Revision: 1574465
URL: http://svn.apache.org/r1574465
Log:
SLING-3432 : increasing default heartbeatTimeout from 60sec to 120sec to be
more resilient in load situations, reducing likelihood of
pseudo-network-partitions
Modified:
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/Config.java
sling/trunk/bundles/extensions/discovery/impl/src/main/resources/OSGI-INF/metatype/metatype.properties
Modified:
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/Config.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/Config.java?rev=1574465&r1=1574464&r2=1574465&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/Config.java
(original)
+++
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/Config.java
Wed Mar 5 13:04:45 2014
@@ -57,7 +57,7 @@ public class Config {
private static final String ONGOING_VOTING_RESOURCE = "ongoingVotings";
/** Configure the timeout (in seconds) after which an instance is
considered dead/crashed. */
- public static final long DEFAULT_HEARTBEAT_TIMEOUT = 60;
+ public static final long DEFAULT_HEARTBEAT_TIMEOUT = 120;
@Property(longValue=DEFAULT_HEARTBEAT_TIMEOUT)
public static final String HEARTBEAT_TIMEOUT_KEY = "heartbeatTimeout";
private long heartbeatTimeout = DEFAULT_HEARTBEAT_TIMEOUT;
Modified:
sling/trunk/bundles/extensions/discovery/impl/src/main/resources/OSGI-INF/metatype/metatype.properties
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1574465&r1=1574464&r2=1574465&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/discovery/impl/src/main/resources/OSGI-INF/metatype/metatype.properties
(original)
+++
sling/trunk/bundles/extensions/discovery/impl/src/main/resources/OSGI-INF/metatype/metatype.properties
Wed Mar 5 13:04:45 2014
@@ -26,7 +26,7 @@ config.description = The configuration o
heartbeatTimeout.name = Heartbeat timeout (seconds)
heartbeatTimeout.description = Configure the timeout (in seconds) after which
an instance is \
- considered dead/crashed. Must be higher than the heartbeat interval! Default
is 60 seconds.
+ considered dead/crashed. Must be higher than the heartbeat interval! Default
is 120 seconds.
heartbeatInterval.name = Heartbeat interval (seconds)
heartbeatInterval.description = Configure the interval (in seconds) according
to which the \
