Author: mreutegg
Date: Wed May 13 09:47:28 2015
New Revision: 1679168
URL: http://svn.apache.org/r1679168
Log:
OAK-2867: CommitQueue.done() may fail to remove commit
Merged revision 1679165 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/CommitQueue.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 09:47:28 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,1675055,1675332,1675354,1675357,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676725,1677939,1678173,1678758
+/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,1675055,1675332,1675354,1675357,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676725,1677939,1678173,1678758,1679165
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java?rev=1679168&r1=1679167&r2=1679168&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java
Wed May 13 09:47:28 2015
@@ -77,8 +77,11 @@ class CommitQueue {
void done(@Nonnull Commit commit, boolean isBranch, @Nullable CommitInfo
info) {
checkNotNull(commit);
if (isBranch) {
- commit.applyToCache(commit.getBaseRevision(), true);
- removeCommit(commit.getRevision());
+ try {
+ commit.applyToCache(commit.getBaseRevision(), true);
+ } finally {
+ removeCommit(commit.getRevision());
+ }
} else {
afterTrunkCommit(commit, info);
}
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java?rev=1679168&r1=1679167&r2=1679168&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java
Wed May 13 09:47:28 2015
@@ -26,11 +26,16 @@ import java.util.concurrent.atomic.Atomi
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.apache.jackrabbit.oak.spi.commit.ChangeDispatcher;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
+
/**
* Tests for {@link CommitQueue}.
*/
@@ -106,4 +111,41 @@ public class CommitQueueTest {
}
}
+ // OAK-2867
+ @Test
+ public void doneFailsWithException() throws Exception {
+ final DocumentNodeStore store = new
DocumentMK.Builder().getNodeStore();
+ final CommitQueue commits = new CommitQueue(store,
+ new ChangeDispatcher(store.getRoot()));
+ Revision r = commits.createRevision();
+ Commit c = new Commit(store, r, store.getHeadRevision(),
+ store.createBranch(store.getRoot())) {
+ @Override
+ public void applyToCache(Revision before, boolean isBranchCommit) {
+ throw new RuntimeException("applyToCache");
+ }
+ };
+
+ try {
+ commits.done(c, true, null);
+ fail("must fail with RuntimeException");
+ } catch (Exception e) {
+ assertEquals("applyToCache", e.getMessage());
+ }
+
+ Thread t = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ Commit c = new Commit(store, commits.createRevision(),
+ store.getHeadRevision(), null);
+ commits.done(c, false, null);
+ }
+ });
+ t.start();
+ t.join(3000);
+ assertFalse("Commit did not succeed within 3 seconds", t.isAlive());
+
+ store.dispose();
+ }
+
}
