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/08/17 09:05:54 UTC
svn commit: r1865342 - 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: Sat Aug 17 09:05:54 2019
New Revision: 1865342
URL: http://svn.apache.org/viewvc?rev=1865342&view=rev
Log:
OAK-8448: VersionGC may get stuck at 60s scope (merged r1862537 and r1862806 into 1.8)
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/VersionGCRecommendations.java
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 17 09:05:54 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,1823671,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,1845
415,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,1853435,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,1855522,1855776,1855905,1855993,1856049,1856056,1856538,1856545,1856818,1857000,1857010,1857221,1857242,1857247,1857253,1857294,1857314,1857332,1857463,1857480,1857634,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,1
860137,1860202,1860328,1860548,1860564-1860565,1861114,1861626,1861743,1861757,1862044,1862370,1862422,1862448,1862465,1862499,1862536,1862728,1862881,1863540,1864349,1864353
+/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,1823671,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,1845
415,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,1853435,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,1855522,1855776,1855905,1855993,1856049,1856056,1856538,1856545,1856818,1857000,1857010,1857221,1857242,1857247,1857253,1857294,1857314,1857332,1857463,1857480,1857634,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,1
860137,1860202,1860328,1860548,1860564-1860565,1861114,1861626,1861743,1861757,1862044,1862370,1862422,1862448,1862465,1862499,1862536-1862537,1862728,1862806,1862881,1863540,1864349,1864353
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCRecommendations.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCRecommendations.java?rev=1865342&r1=1865341&r2=1865342&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCRecommendations.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCRecommendations.java Sat Aug 17 09:05:54 2019
@@ -42,6 +42,7 @@ public class VersionGCRecommendations {
final long maxCollect;
final long deleteCandidateCount;
final long lastOldestTimestamp;
+ final long originalCollectLimit;
private final long precisionMs;
final long suggestedIntervalMs;
@@ -71,16 +72,18 @@ public class VersionGCRecommendations {
*/
public VersionGCRecommendations(long maxRevisionAgeMs, Checkpoints checkpoints, Clock clock, VersionGCSupport vgc,
VersionGCOptions options, GCMonitor gcMonitor) {
- this.vgc = vgc;
- this.gcmon = gcMonitor;
-
- TimeInterval keep = new TimeInterval(clock.getTime() - maxRevisionAgeMs, Long.MAX_VALUE);
boolean ignoreDueToCheckPoint = false;
long deletedOnceCount = 0;
long suggestedIntervalMs;
long oldestPossible;
long collectLimit = options.collectLimit;
+ this.vgc = vgc;
+ this.gcmon = gcMonitor;
+ this.originalCollectLimit = options.collectLimit;
+
+ TimeInterval keep = new TimeInterval(clock.getTime() - maxRevisionAgeMs, Long.MAX_VALUE);
+
Map<String, Long> settings = getLongSettings();
lastOldestTimestamp = settings.get(VersionGarbageCollector.SETTINGS_COLLECTION_OLDEST_TIMESTAMP_PROP);
if (lastOldestTimestamp == 0) {
@@ -178,16 +181,26 @@ public class VersionGCRecommendations {
// success, we would not expect to encounter revisions older than this in the future
setLongSetting(VersionGarbageCollector.SETTINGS_COLLECTION_OLDEST_TIMESTAMP_PROP, scope.toMs);
+ int count = stats.deletedDocGCCount - stats.deletedLeafDocGCCount;
+ double usedFraction;
+ double allowedFraction = 0.66;
+
if (maxCollect <= 0) {
- VersionGarbageCollector.log.debug("successful run without effective limit, keeping recommendations");
- } else if (scope.getDurationMs() == suggestedIntervalMs) {
- int count = stats.deletedDocGCCount - stats.deletedLeafDocGCCount;
- double used = count / (double) maxCollect;
- if (used < 0.66) {
+ usedFraction = count / (double) this.originalCollectLimit;
+ } else {
+ usedFraction = count / (double) maxCollect;
+ }
+
+ if (scope.getDurationMs() == suggestedIntervalMs) {
+ if (usedFraction < allowedFraction) {
long nextDuration = (long) Math.ceil(suggestedIntervalMs * 1.5);
- VersionGarbageCollector.log.debug("successful run using {}% of limit, raising recommended interval to {} seconds",
- Math.round(used*1000)/10.0, TimeUnit.MILLISECONDS.toSeconds(nextDuration));
+ VersionGarbageCollector.log.debug(
+ "successful run using {}% of limit, raising recommended interval to {} seconds",
+ Math.round(usedFraction * 1000) / 10.0, TimeUnit.MILLISECONDS.toSeconds(nextDuration));
setLongSetting(VersionGarbageCollector.SETTINGS_COLLECTION_REC_INTERVAL_PROP, nextDuration);
+ } else {
+ VersionGarbageCollector.log.debug("not increasing limit: collected {} documents ({}% >= {}% limit)", count,
+ usedFraction, allowedFraction);
}
} else {
VersionGarbageCollector.log.debug("successful run not following recommendations, keeping them");
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java?rev=1865342&r1=1865341&r2=1865342&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java Sat Aug 17 09:05:54 2019
@@ -259,6 +259,57 @@ public class VersionGCTest {
assertTrue(nduration == duration / 2);
}
+ // OAK-8448: test that after shrinking the scope to the minimum and after
+ // successful runs, scope will be expanded again
+ @Test
+ public void expandIntervalAgain() throws Exception {
+
+ VersionGCOptions options = gc.getOptions();
+ VersionGCRecommendations rec;
+ VersionGCStats stats;
+ VersionGCSupport localgcsupport;
+ GCMonitor testmonitor = new TestGCMonitor();
+
+ int days = 365;
+ long secondsPerDay = TimeUnit.DAYS.toMillis(1);
+ long oldestDeleted = ns.getClock().getTime() - TimeUnit.DAYS.toMillis(days);
+ // one per second
+ long deletedCount = TimeUnit.DAYS.toSeconds(days);
+
+ localgcsupport = fakeVersionGCSupport(ns.getDocumentStore(), oldestDeleted, deletedCount);
+
+ // loop until the recommended interval is at 60s (precisionMS)
+ do {
+ rec = new VersionGCRecommendations(secondsPerDay, ns.getCheckpoints(), ns.getClock(), localgcsupport, options,
+ testmonitor);
+ stats = new VersionGCStats();
+ stats.limitExceeded = true;
+ rec.evaluate(stats);
+ assertTrue(stats.needRepeat);
+ } while (rec.suggestedIntervalMs > options.precisionMs);
+
+ // loop with successful runs (1 node/sec interval deleted) and observe the interval
+ int iterations = 0;
+ int maxiterations = 1000;
+ do {
+ iterations += 1;
+ oldestDeleted = rec.scope.fromMs + rec.scope.getDurationMs();
+ int deleted = (int) (rec.scope.getDurationMs() / TimeUnit.SECONDS.toMillis(1));
+ deletedCount -= deleted;
+ localgcsupport = fakeVersionGCSupport(ns.getDocumentStore(), oldestDeleted, deletedCount);
+ rec = new VersionGCRecommendations(secondsPerDay, ns.getCheckpoints(), ns.getClock(), localgcsupport, options,
+ testmonitor);
+ stats = new VersionGCStats();
+ stats.limitExceeded = false;
+ stats.deletedDocGCCount = deleted;
+ stats.deletedLeafDocGCCount = 0;
+ rec.evaluate(stats);
+ } while (stats.needRepeat && iterations < maxiterations);
+
+ assertTrue("VersionGC should have finished after " + maxiterations + " iterations, but did not. Last scope was: "
+ + rec.scope + ".", !stats.needRepeat);
+ }
+
// OAK-7378
@Test
public void recommendedInterval() throws Exception {