Author: mreutegg
Date: Wed Dec 12 15:34:06 2018
New Revision: 1848769
URL: http://svn.apache.org/viewvc?rev=1848769&view=rev
Log:
OAK-7956: Conflict may leave behind _collisions entry
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionCleanupTest.java
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1848769&r1=1848768&r2=1848769&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Wed Dec 12 15:34:06 2018
@@ -191,6 +191,11 @@ public final class DocumentNodeStore
private int journalPushThreshold =
Integer.getInteger("oak.journalPushThreshold", 100000);
/**
+ * How many collision entries to collect in a single call.
+ */
+ private int collisionGarbageBatchSize =
Integer.getInteger("oak.documentMK.collisionGarbageBatchSize", 1000);
+
+ /**
* The document store without potentially lease checking wrapper.
*/
private final DocumentStore nonLeaseCheckingStore;
@@ -2025,7 +2030,7 @@ public final class DocumentNodeStore
long time = start;
// clean orphaned branches and collisions
cleanOrphanedBranches();
- cleanCollisions();
+ cleanRootCollisions();
long cleanTime = clock.getTime() - time;
time = clock.getTime();
// split documents (does not create new revisions)
@@ -2285,16 +2290,19 @@ public final class DocumentNodeStore
store.findAndUpdate(NODES, op);
}
}
-
- private void cleanCollisions() {
+
+ private void cleanRootCollisions() {
String id = Utils.getIdFromPath("/");
NodeDocument root = store.find(NODES, id);
- if (root == null) {
- return;
+ if (root != null) {
+ cleanCollisions(root, Integer.MAX_VALUE);
}
+ }
+
+ private void cleanCollisions(NodeDocument doc, int limit) {
RevisionVector head = getHeadRevision();
- Map<Revision, String> map = root.getLocalMap(NodeDocument.COLLISIONS);
- UpdateOp op = new UpdateOp(id, false);
+ Map<Revision, String> map = doc.getLocalMap(NodeDocument.COLLISIONS);
+ UpdateOp op = new UpdateOp(doc.getId(), false);
for (Revision r : map.keySet()) {
if (r.getClusterId() == clusterId) {
// remove collision if there is no active branch with
@@ -2304,11 +2312,15 @@ public final class DocumentNodeStore
if (branches.getBranchCommit(r) == null
&& !head.isRevisionNewer(r)) {
NodeDocument.removeCollision(op, r);
+ if (--limit <= 0) {
+ break;
+ }
}
}
}
if (op.hasChanges()) {
- LOG.debug("Removing collisions {}", op.getChanges().keySet());
+ LOG.debug("Removing collisions {} on {}",
+ op.getChanges().keySet(), doc.getId());
store.findAndUpdate(NODES, op);
}
}
@@ -2321,6 +2333,7 @@ public final class DocumentNodeStore
if (doc == null) {
continue;
}
+ cleanCollisions(doc, collisionGarbageBatchSize);
for (UpdateOp op : doc.split(this, head, binarySize)) {
NodeDocument before = null;
if (!op.isNew() ||
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionCleanupTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionCleanupTest.java?rev=1848769&r1=1848768&r2=1848769&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionCleanupTest.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionCleanupTest.java
Wed Dec 12 15:34:06 2018
@@ -30,7 +30,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
@@ -40,11 +39,13 @@ import static org.apache.jackrabbit.oak.
import static
org.apache.jackrabbit.oak.plugins.document.NodeDocument.COLLISIONS;
import static org.apache.jackrabbit.oak.plugins.document.TestUtils.merge;
import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasSize;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
// OAK-7956
-@Ignore("OAK-7956")
public class CollisionCleanupTest {
private static final Logger LOG =
LoggerFactory.getLogger(CollisionCleanupTest.class);
@@ -84,16 +85,83 @@ public class CollisionCleanupTest {
executor.invokeAll(tasks);
String id = Utils.getIdFromPath("/test");
+ ns1.addSplitCandidate(id);
+ ns1.runBackgroundOperations();
+ ns2.addSplitCandidate(id);
+ ns2.runBackgroundOperations();
+
DocumentStore store = ns1.getDocumentStore();
- store.invalidateCache(NODES, id);
NodeDocument doc = store.find(NODES, id);
assertNotNull(doc);
assertThat(doc.getValueMap(COLLISIONS).keySet(), empty());
}
+ @Test
+ public void batchCleanup() throws Exception {
+ Revision r = ns1.newRevision();
+ NodeBuilder b1 = ns1.getRoot().builder();
+ b1.child("test");
+ merge(ns1, b1);
+
+ String id = Utils.getIdFromPath("/test");
+ Revision other = new Revision(r.getTimestamp(), r.getCounter(),
r.getClusterId() + 1);
+ // add lots of old collisions
+ UpdateOp op = new UpdateOp(id, false);
+ for (int i = 0; i < 5000; i++) {
+ NodeDocument.addCollision(op, r, other);
+ r = new Revision(r.getTimestamp() - 1, 0, r.getClusterId());
+ }
+ NodeDocument doc = ns1.getDocumentStore().findAndUpdate(NODES, op);
+ assertNotNull(doc);
+
+ for (int i = 1; i <= 5; i++) {
+ // each background operation run will clean up 1000 collision
entries
+ ns1.addSplitCandidate(id);
+ ns1.runBackgroundOperations();
+
+ doc = ns1.getDocumentStore().find(NODES, id);
+ assertNotNull(doc);
+ assertEquals(5000 - i * 1000, doc.getLocalMap(COLLISIONS).size());
+ }
+ }
+
+ @Test
+ public void branchCollision() throws Exception {
+ NodeBuilder builder = ns1.getRoot().builder();
+ builder.child("conflict");
+ // trigger a branch commit
+ for (int i = 0; i < 200; i++) {
+ builder.child("n-" + i).setProperty("p", "v");
+ }
+
+ // this one wins and will create a collision marker
+ NodeBuilder b2 = ns1.getRoot().builder();
+ b2.child("conflict");
+ merge(ns1, b2);
+
+ NodeDocument doc = Utils.getRootDocument(ns1.getDocumentStore());
+ assertThat(doc.getLocalMap(COLLISIONS).keySet(), hasSize(1));
+
+ // must not clean up marker
+ ns1.addSplitCandidate(Utils.getIdFromPath("/"));
+ ns1.runBackgroundOperations();
+
+ doc = Utils.getRootDocument(ns1.getDocumentStore());
+ assertThat(doc.getLocalMap(COLLISIONS).keySet(), hasSize(1));
+
+ // must not be able to merge
+ try {
+ merge(ns1, builder);
+ fail("CommitFailedException expected");
+ } catch (CommitFailedException e) {
+ // expected
+ }
+ }
+
private DocumentNodeStore newDocumentNodeStore(int clusterId) {
DocumentNodeStore ns = builderProvider.newBuilder()
.setClusterId(clusterId).setAsyncDelay(0)
+ .setUpdateLimit(100)
.setDocumentStore(store).build();
// do not retry on conflicts
ns.setMaxBackOffMillis(0);
