Author: chetanm
Date: Sat Nov 5 14:44:12 2016
New Revision: 1768223
URL: http://svn.apache.org/viewvc?rev=1768223&view=rev
Log:
OAK-5066 - Provide a config option to disable lease check at
DocumentNodeStoreService level
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.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=1768223&r1=1768222&r2=1768223&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
Sat Nov 5 14:44:12 2016
@@ -202,6 +202,9 @@ public class ClusterNodeInfo {
*/
public static final int DEFAULT_LEASE_FAILURE_MARGIN_MILLIS = 1000 * 20;
+ public static final boolean DEFAULT_LEASE_CHECK_DISABLED =
+
Boolean.valueOf(System.getProperty("oak.documentMK.disableLeaseCheck",
"false"));
+
/** OAK-3399 : max number of times we're doing a 1sec retry loop just
before declaring lease failure **/
private static final int MAX_RETRY_SLEEPS_BEFORE_LEASE_FAILURE = 5;
@@ -350,7 +353,7 @@ public class ClusterNodeInfo {
this.state = state;
this.revRecoveryLock = revRecoveryLock;
this.newEntry = newEntry;
- this.leaseCheckDisabled =
Boolean.valueOf(System.getProperty("oak.documentMK.disableLeaseCheck",
"false"));
+ this.leaseCheckDisabled = DEFAULT_LEASE_CHECK_DISABLED;
}
public void setLeaseCheckDisabled(boolean leaseCheckDisabled) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java?rev=1768223&r1=1768222&r2=1768223&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
Sat Nov 5 14:44:12 2016
@@ -456,7 +456,7 @@ public class DocumentNodeStoreService {
setCacheSegmentCount(cacheSegmentCount).
setCacheStackMoveDistance(cacheStackMoveDistance).
setBundlingDisabled(bundlingDisabled).
- setLeaseCheck(true /* OAK-2739: enabled by default */).
+ setLeaseCheck(!ClusterNodeInfo.DEFAULT_LEASE_CHECK_DISABLED /*
OAK-2739: enabled by default */).
setLeaseFailureHandler(new LeaseFailureHandler() {
@Override
