svn commit: r1680477 - in /jackrabbit/oak/branches/1.2: ./ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java

[mreutegg]

Author: mreutegg
Date: Wed May 20 07:53:33 2015
New Revision: 1680477

URL: http://svn.apache.org/r1680477
Log:
OAK-2822: Release merge lock in retry loop

Merged revision 1676693 from trunk

Modified:
    jackrabbit/oak/branches/1.2/   (props changed)
    
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java

Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 20 07:53:33 2015
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675054-1675055,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676725,1677579,1677581,1677609,1677611,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679235,1680182,1680222,1680232,1680236,1680461
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675054-1675055,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676725,1677579,1677581,1677609,1677611,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679235,1680182,1680222,1680232,1680236,1680461
 /jackrabbit/trunk:1345480

Modified: 
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java?rev=1680477&r1=1680476&r2=1680477&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java
 (original)
+++ 
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java
 Wed May 20 07:53:33 2015
@@ -173,7 +173,7 @@ class DocumentNodeStoreBranch implements
     public NodeState merge(@Nonnull CommitHook hook, @Nonnull CommitInfo info)
             throws CommitFailedException {
         try {
-            return merge0(hook, info);
+            return merge0(hook, info, false);
         } catch (CommitFailedException e) {
             if (!e.isOfType(MERGE)) {
                 throw e;
@@ -181,20 +181,7 @@ class DocumentNodeStoreBranch implements
         }
         // retry with exclusive lock, blocking other
         // concurrent writes
-        // do not wait forever
-        Lock lock = null;
-        try {
-            lock = acquireMergeLock(true);
-        } catch (InterruptedException e) {
-            // ignore and proceed with shared lock used in base class
-        }
-        try {
-            return merge0(hook, info);
-        } finally {
-            if (lock != null) {
-                lock.unlock();
-            }
-        }
+        return merge0(hook, info, true);
     }
 
     @Override
@@ -210,7 +197,9 @@ class DocumentNodeStoreBranch implements
     //------------------------------< internal 
>--------------------------------
 
     @Nonnull
-    private NodeState merge0(@Nonnull CommitHook hook, @Nonnull CommitInfo 
info)
+    private NodeState merge0(@Nonnull CommitHook hook,
+                             @Nonnull CommitInfo info,
+                             boolean exclusive)
             throws CommitFailedException {
         CommitFailedException ex = null;
         long time = System.currentTimeMillis();
@@ -229,7 +218,7 @@ class DocumentNodeStoreBranch implements
             }
             try {
                 final long start = perfLogger.start();
-                Lock lock = acquireMergeLock(false);
+                Lock lock = acquireMergeLock(exclusive);
                 try {
                     perfLogger.end(start, 1, "Merge - Acquired lock");
                     return branchState.merge(checkNotNull(hook), 
checkNotNull(info));