svn commit: r1767736 - in /jackrabbit/oak/trunk: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java

[chetanm]

Author: chetanm
Date: Wed Nov  2 17:02:00 2016
New Revision: 1767736

URL: http://svn.apache.org/viewvc?rev=1767736&view=rev
Log:
OAK-4881 - Make merge semaphore in SegmentNodeStore fair by default

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
    
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java?rev=1767736&r1=1767735&r2=1767736&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
 Wed Nov  2 17:02:00 2016
@@ -193,11 +193,11 @@ public class SegmentNodeStore implements
      * Flag controlling the commit lock fairness
      */
     private static final boolean COMMIT_FAIR_LOCK = Boolean
-            .getBoolean("oak.segmentNodeStore.commitFairLock");
+            
.parseBoolean(System.getProperty("oak.segmentNodeStore.commitFairLock", 
"true"));
 
     private SegmentNodeStore(SegmentNodeStoreBuilder builder) {
         if (COMMIT_FAIR_LOCK) {
-            log.info("initializing SegmentNodeStore with the commitFairLock 
option enabled.");
+            log.info("Initializing SegmentNodeStore with the commitFairLock 
option enabled.");
         }
         this.commitSemaphore = new Semaphore(1, COMMIT_FAIR_LOCK);
         this.revisions = builder.revisions;

Modified: 
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java?rev=1767736&r1=1767735&r2=1767736&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
 Wed Nov  2 17:02:00 2016
@@ -187,12 +187,12 @@ public class SegmentNodeStore implements
     /**
      * Flag controlling the commit lock fairness
      */
-    private final boolean commitFairLock = Boolean
-            .getBoolean("oak.segmentNodeStore.commitFairLock");
+    private static final boolean commitFairLock = Boolean
+            
.parseBoolean(System.getProperty("oak.segmentNodeStore.commitFairLock", 
"true"));
 
     private SegmentNodeStore(SegmentNodeStoreBuilder builder) {
         if (commitFairLock) {
-            log.info("initializing SegmentNodeStore with the commitFairLock 
option enabled.");
+            log.info("Initializing SegmentNodeStore with the commitFairLock 
option enabled.");
         }
         this.commitSemaphore = new Semaphore(1, commitFairLock);
         this.store = builder.store;