svn commit: r1727105 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java

[reschke]

Author: reschke
Date: Wed Jan 27 16:04:27 2016
New Revision: 1727105

URL: http://svn.apache.org/viewvc?rev=1727105&view=rev
Log:
OAK-3871: ability to override ClusterNodeInfo#DEFAULT_LEASE_DURATION_MILLIS

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java?rev=1727105&r1=1727104&r2=1727105&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
 Wed Jan 27 16:04:27 2016
@@ -177,8 +177,17 @@ public class ClusterNodeInfo {
      */
     private static Clock clock = Clock.SIMPLE;
 
-    /** OAK-3398 : default lease duration 120sec **/
-    public static final int DEFAULT_LEASE_DURATION_MILLIS = 1000 * 120;
+    public static final int DEFAULT_LEASE_DURATION_MILLIS;
+
+    static {
+        String leaseDurationProp = "oak.documentMK.leaseDurationSeconds";
+        Integer leaseProp = Integer.getInteger(leaseDurationProp);
+        if (leaseProp != null) {
+            LOG.info("Lease duration set to: " + leaseProp + "s (using system 
property " + leaseDurationProp + ")");
+        }
+        /** OAK-3398 : default lease duration 120sec **/
+        DEFAULT_LEASE_DURATION_MILLIS = 1000 * (leaseProp != null ? leaseProp 
: 120);
+    }
 
     /** OAK-3398 : default update interval 10sec **/
     public static final int DEFAULT_LEASE_UPDATE_INTERVAL_MILLIS = 1000 * 10;