Author: mreutegg
Date: Wed Jul 24 14:29:55 2019
New Revision: 1863697
URL: http://svn.apache.org/viewvc?rev=1863697&view=rev
Log:
OAK-7956: Conflict may leave behind _collisions entry
Merge revisions 1848729 and 1848769 from trunk
Added:
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionCleanupTest.java
- copied, changed from r1848729,
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionCleanupTest.java
Modified:
jackrabbit/oak/branches/1.6/oak-core/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Propchange: jackrabbit/oak/branches/1.6/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 24 14:29:55 2019
@@ -3,5 +3,5 @@
/jackrabbit/oak/trunk:1834823
/jackrabbit/oak/trunk/oak-blob-plugins:1819950
/jackrabbit/oak/trunk/oak-core:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785652,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789441,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799861,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,180226
2,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1810084,1811380,1811952,1811963,1811986,1814332,1818645,1821325,1821358,1821516,1830160,1840226,1846057,1846162
-/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1817379,1817772,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821178,1821477,1821487,1821617,1821663,1823163,1823169,1824962,1825065,1825442,1825470,1826560,1826833,1828349,1828868,1830048,1830209,1834610,1834823,1838076,1840455,1842089,1848073,1852451,1852492-1852493,1852601,1854034,1854455,1854701,1854827,1854930,1859020,1860202
+/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1817379,1817772,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821178,1821477,1821487,1821617,1821663,1823163,1823169,1824962,1825065,1825442,1825470,1826560,1826833,1828349,1828868,1830048,1830209,1834610,1834823,1838076,1840455,1842089,1848073,1848729,1848769,1852451,1852492-1852493,1852601,1854034,1854455,1854701,1854827,1854930,1859020,1860202
/jackrabbit/trunk/oak-core:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1863697&r1=1863696&r2=1863697&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Wed Jul 24 14:29:55 2019
@@ -193,6 +193,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;
@@ -1907,7 +1912,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)
@@ -2173,16 +2178,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
@@ -2192,11 +2200,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);
}
}
@@ -2209,6 +2221,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() ||
Copied:
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionCleanupTest.java
(from r1848729,
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/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionCleanupTest.java?p2=jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionCleanupTest.java&p1=jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionCleanupTest.java&r1=1848729&r2=1863697&rev=1863697&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionCleanupTest.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionCleanupTest.java
Wed Jul 24 14:29:55 2019
@@ -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,17 +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 < DocumentRootBuilder.UPDATE_LIMIT * 2; 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)
- .setDocumentStore(store).build();
+ .setDocumentStore(store).getNodeStore();
// do not retry on conflicts
ns.setMaxBackOffMillis(0);
return ns;
