You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2014/02/17 15:01:22 UTC
svn commit: r1568994 - in
/sling/trunk/bundles/extensions/discovery/impl/src/main:
java/org/apache/sling/discovery/impl/Config.java
resources/OSGI-INF/metatype/metatype.properties
Author: stefanegli
Date: Mon Feb 17 14:01:21 2014
New Revision: 1568994
URL: http://svn.apache.org/r1568994
Log:
SLING-3396 : increase heartbeatInterval from 15s to 30s and heartbeatTimeout from 45s to 60s
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=1568994&r1=1568993&r2=1568994&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 Mon Feb 17 14:01:21 2014
@@ -57,13 +57,13 @@ 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 = 45;
+ public static final long DEFAULT_HEARTBEAT_TIMEOUT = 60;
@Property(longValue=DEFAULT_HEARTBEAT_TIMEOUT)
public static final String HEARTBEAT_TIMEOUT_KEY = "heartbeatTimeout";
private long heartbeatTimeout = DEFAULT_HEARTBEAT_TIMEOUT;
/** Configure the interval (in seconds) according to which the heartbeats are exchanged in the topology. */
- public static final long DEFAULT_HEARTBEAT_INTERVAL = 15;
+ public static final long DEFAULT_HEARTBEAT_INTERVAL = 30;
@Property(longValue=DEFAULT_HEARTBEAT_INTERVAL)
public static final String HEARTBEAT_INTERVAL_KEY = "heartbeatInterval";
private long heartbeatInterval = DEFAULT_HEARTBEAT_INTERVAL;
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=1568994&r1=1568993&r2=1568994&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 Mon Feb 17 14:01:21 2014
@@ -26,11 +26,11 @@ 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 45 seconds.
+ considered dead/crashed. Must be higher than the heartbeat interval! Default is 60 seconds.
heartbeatInterval.name = Heartbeat interval (seconds)
heartbeatInterval.description = Configure the interval (in seconds) according to which the \
- heartbeats are exchanged in the topology. Default is 15 seconds.
+ heartbeats are exchanged in the topology. Default is 30 seconds.
minEventDelay.name = Minimal Event Delay (seconds)
minEventDelay.description = Configure a minimal delay (in seconds) between TOPOLOGY_CHANGING \