Author: stefanegli
Date: Mon Jul 1 15:37:25 2019
New Revision: 1862389
URL: http://svn.apache.org/viewvc?rev=1862389&view=rev
Log:
OAK-8351 : backported 1862044 from trunk to 1.8 branch : split rgc query into 2
simpler queries to work around mongodb bug where the wrong index was chosen,
resulting in long running _id_ index scan
Added:
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSplitDocTest.java
- copied, changed from r1862044,
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSplitDocTest.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/mongo/MongoVersionGCSupport.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 1 15:37:25 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,1827815-1827816,1827835,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,1845
405,1845415,1845730-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-1
860565,1861270,1861626,1862093
+/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,1
862044
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java?rev=1862389&r1=1862388&r2=1862389&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
Mon Jul 1 15:37:25 2019
@@ -19,6 +19,7 @@
package org.apache.jackrabbit.oak.plugins.document.mongo;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -38,6 +39,7 @@ import com.mongodb.DBCursor;
import com.mongodb.DBObject;
import com.mongodb.QueryBuilder;
import com.mongodb.ReadPreference;
+
import org.apache.jackrabbit.oak.plugins.document.Document;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.apache.jackrabbit.oak.plugins.document.Revision;
@@ -52,10 +54,11 @@ import org.jetbrains.annotations.NotNull
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static com.google.common.collect.Iterables.concat;
import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.transform;
import static com.mongodb.QueryBuilder.start;
-import static java.util.Collections.singletonList;
+import static java.util.Collections.emptyList;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
import static org.apache.jackrabbit.oak.plugins.document.Document.ID;
import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.PATH;
@@ -125,19 +128,33 @@ public class MongoVersionGCSupport exten
protected Iterable<NodeDocument> identifyGarbage(final Set<SplitDocType>
gcTypes,
final RevisionVector
sweepRevs,
final long
oldestRevTimeStamp) {
- return filter(transform(getNodeCollection().find(
- createQuery(gcTypes, sweepRevs, oldestRevTimeStamp)),
- new Function<DBObject, NodeDocument>() {
- @Override
- public NodeDocument apply(DBObject input) {
- return store.convertFromDBObject(NODES, input);
- }
- }), new Predicate<NodeDocument>() {
- @Override
- public boolean apply(NodeDocument input) {
- return !isDefaultNoBranchSplitNewerThan(input, sweepRevs);
- }
- });
+ // With OAK-8351 this switched from 1 to 2 queries (see createQueries)
+ // hence we iterate over the queries returned by createQueries
+ List<DBObject> queries = createQueries(gcTypes, sweepRevs,
oldestRevTimeStamp);
+ Iterable<NodeDocument> allResults = emptyList();
+ for (DBObject query : queries) {
+ // this query uses a timeout of 15min. hitting the timeout will
+ // result in an exception which should show up in the log file.
+ // while this doesn't resolve the situation (the restructuring
+ // of the query as part of OAK-8351 does), it nevertheless
+ // makes any future similar problem more visible than long running
+ // queries alone (15min is still long).
+ Iterable<NodeDocument> iterable =
filter(transform(getNodeCollection().find(query)
+ .maxTime(15, TimeUnit.MINUTES),
+ new Function<DBObject, NodeDocument>() {
+ @Override
+ public NodeDocument apply(DBObject input) {
+ return store.convertFromDBObject(NODES, input);
+ }
+ }), new Predicate<NodeDocument>() {
+ @Override
+ public boolean apply(NodeDocument input) {
+ return !isDefaultNoBranchSplitNewerThan(input, sweepRevs);
+ }
+ });
+ allResults = concat(allResults, iterable);
+ }
+ return allResults;
}
@Override
@@ -169,35 +186,35 @@ public class MongoVersionGCSupport exten
return clock.getTime();
}
- private DBObject createQuery(Set<SplitDocType> gcTypes,
+ private List<DBObject> createQueries(Set<SplitDocType> gcTypes,
RevisionVector sweepRevs,
long oldestRevTimeStamp) {
- List<Integer> gcTypeCodes = Lists.newArrayList();
- QueryBuilder orClause = start();
+ List<DBObject> result = Lists.newArrayList();
+ QueryBuilder orClauses = start();
for(SplitDocType type : gcTypes) {
- gcTypeCodes.add(type.typeCode());
- for (DBObject query : queriesForType(type, sweepRevs)) {
- orClause.or(query);
+ if (DEFAULT_NO_BRANCH != type) {
+ orClauses.or(start(SD_TYPE).is(type.typeCode()).get());
+ } else {
+ result.add(queryForDefaultNoBranch(sweepRevs,
getModifiedInSecs(oldestRevTimeStamp)));
}
}
- return start()
+ // OAK-8351: this (last) query only contains SD_TYPE and
SD_MAX_REV_TIME_IN_SECS
+ // so mongodb should really use that _sdType_1__sdMaxRevTime_1 index
+ result.add(start()
.and(
- start(SD_TYPE).in(gcTypeCodes).get(),
- orClause.get(),
+ orClauses.get(),
start(NodeDocument.SD_MAX_REV_TIME_IN_SECS)
.lessThan(NodeDocument.getModifiedInSecs(oldestRevTimeStamp))
.get()
- ).get();
+ ).get());
+ return result;
}
@NotNull
- private Iterable<DBObject> queriesForType(SplitDocType type,
RevisionVector sweepRevs) {
- if (type != DEFAULT_NO_BRANCH) {
- return singletonList(start(SD_TYPE).is(type.typeCode()).get());
- }
+ private DBObject queryForDefaultNoBranch(RevisionVector sweepRevs, long
maxRevTimeInSecs) {
// default_no_branch split type is special because we can
// only remove those older than sweep rev
- List<DBObject> queries = Lists.newArrayList();
+ ArrayList<DBObject> orClauses = Lists.newArrayList();
for (Revision r : sweepRevs) {
String idSuffix = Utils.getPreviousIdFor("/", r, 0);
idSuffix = idSuffix.substring(idSuffix.lastIndexOf('-'));
@@ -209,12 +226,17 @@ public class MongoVersionGCSupport exten
idPathClause.or(start(ID).regex(Pattern.compile("[^-]*"))
.and(PATH).regex(Pattern.compile(".*" + idSuffix)).get());
- queries.add(start(SD_TYPE).is(type.typeCode())
+ orClauses.add(start()
.and(idPathClause.get())
.and(SD_MAX_REV_TIME_IN_SECS).lessThan(getModifiedInSecs(r.getTimestamp()))
.get());
}
- return queries;
+ return start()
+ .and(
+ start(SD_TYPE).is(DEFAULT_NO_BRANCH.typeCode()).get(),
+
start(NodeDocument.SD_MAX_REV_TIME_IN_SECS).lessThan(maxRevTimeInSecs).get(),
+ start().or(orClauses.toArray(new
DBObject[orClauses.size()])).get()
+ ).get();
}
private void logSplitDocIdsTobeDeleted(DBObject query) {
@@ -266,15 +288,21 @@ public class MongoVersionGCSupport exten
@Override
protected int deleteSplitDocuments() {
- DBObject query = createQuery(gcTypes, sweepRevs,
oldestRevTimeStamp);
+ List<DBObject> queries = createQueries(gcTypes, sweepRevs,
oldestRevTimeStamp);
if(LOG.isDebugEnabled()){
//if debug level logging is on then determine the id of
documents to be deleted
//and log them
- logSplitDocIdsTobeDeleted(query);
+ for (DBObject query : queries) {
+ logSplitDocIdsTobeDeleted(query);
+ }
}
- return getNodeCollection().remove(query).getN();
+ int cnt = 0;
+ for (DBObject query : queries) {
+ cnt += getNodeCollection().remove(query).getN();
+ }
+ return cnt;
}
}
}
Copied:
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSplitDocTest.java
(from r1862044,
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSplitDocTest.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSplitDocTest.java?p2=jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSplitDocTest.java&p1=jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSplitDocTest.java&r1=1862044&r2=1862389&rev=1862389&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSplitDocTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSplitDocTest.java
Mon Jul 1 15:37:25 2019
@@ -117,7 +117,7 @@ public class VersionGCSplitDocTest {
clock.waitUntil(System.currentTimeMillis());
Revision.setClock(clock);
- ns =
builderProvider.newBuilder().clock(clock).setLeaseCheckMode(LeaseCheckMode.DISABLED)
+ ns = builderProvider.newBuilder().clock(clock).setLeaseCheck(false)
.setDocumentStore(store).setAsyncDelay(0).getNodeStore();
gc = ns.getVersionGarbageCollector();
}
