You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2019/06/26 12:58:23 UTC
svn commit: r1862133 - in /jackrabbit/oak/branches/1.8: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/
oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/
Author: reschke
Date: Wed Jun 26 12:58:23 2019
New Revision: 1862133
URL: http://svn.apache.org/viewvc?rev=1862133&view=rev
Log:
OAK-7956: Conflict may leave behind _collisions entry (merged r1848729, r1848769 into 1.8)
Added:
jackrabbit/oak/branches/1.8/oak-store-document/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.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 26 12:58:23 2019
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0:1665962
/jackrabbit/oak/branches/1.10:1854524
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822496,1822527,1822638,1822642,1822645,1822723,1822802,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826089-1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828868,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048
,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833702,1833833,1834109,1834112,1834117,1834287,1834291,1834302,1834312,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835056,1835060,1835062,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837596,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1841909,1842089,1842240,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843669,1843905,1843911,1843994,1844070,1844110,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845
730-1845731,1845863,1845865,1846057,1846162,1846396,1846429,1846486,1846581,1846617,1847088,1847096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850319,1850343,1850837,1850874,1851533-1851535,1851619,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1853083,1853141,1853229,1853393,1853429,1853433,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1855032,1855776,1855993,1856049,1856056,1856538,1856545,1856818,1857000,1857010,1857221,1857247,1857253,1857294,1857314,1857463,1857480,1857638,1857936,1858032,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1859020,1859231,1859292,1859294,1859533,1859609,1859612,1859711,1859716,1859772,1859776,1859780,1859843,1859881,1860120,1860131,1860137,1860202,1860328,1860548,1860564-1860565,1861626
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822496,1822527,1822638,1822642,1822645,1822723,1822802,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826089-1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828868,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048
,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833702,1833833,1834109,1834112,1834117,1834287,1834291,1834302,1834312,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835056,1835060,1835062,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837596,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1841909,1842089,1842240,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843637,1843652,1843669,1843905,1843911,1843994,1844070,1844110,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845
730-1845731,1845863,1845865,1846057,1846162,1846396,1846429,1846486,1846581,1846617,1847088,1847096,1848073,1848181-1848182,1848191,1848217,1848729,1848769,1848822-1848823,1850221,1850319,1850343,1850837,1850874,1851533-1851535,1851619,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1853083,1853141,1853229,1853393,1853429,1853433,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1855032,1855776,1855993,1856049,1856056,1856538,1856545,1856818,1857000,1857010,1857221,1857247,1857253,1857294,1857314,1857463,1857480,1857638,1857936,1858032,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1859020,1859231,1859292,1859294,1859533,1859609,1859612,1859711,1859716,1859772,1859776,1859780,1859843,1859881,1860120,1860131,1860137,1860202,1860328,1860548,1860564-1860565,1861626
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1862133&r1=1862132&r2=1862133&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Wed Jun 26 12:58:23 2019
@@ -199,6 +199,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;
@@ -2091,7 +2096,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)
@@ -2349,16 +2354,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
@@ -2368,11 +2376,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);
}
}
@@ -2385,6 +2397,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.8/oak-store-document/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.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionCleanupTest.java?p2=jackrabbit/oak/branches/1.8/oak-store-document/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=1862133&rev=1862133&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionCleanupTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionCleanupTest.java Wed Jun 26 12:58:23 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,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);