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 am...@apache.org on 2015/09/11 10:01:45 UTC
svn commit: r1702391 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/...
Author: amitj
Date: Fri Sep 11 08:01:45 2015
New Revision: 1702391
URL: http://svn.apache.org/r1702391
Log:
OAK-3360: Tracking the start time of mark in GC for a shared datastore
Merged revision 1702387 from trunk
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/GarbageCollectionRepoStats.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/SharedDataStoreUtils.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStoreUtilsTest.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 11 08:01:45 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1695050,1695122,1695280,1695299,1695457,1695482,1695507,1695521,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697
582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701986,1702022,1702272
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1695050,1695122,1695280,1695299,1695457,1695482,1695507,1695521,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697
582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701986,1702022,1702272,1702387
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java?rev=1702391&r1=1702390&r2=1702391&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobGC.java Fri Sep 11 08:01:45 2015
@@ -117,7 +117,8 @@ public class BlobGC extends AnnotatedSt
private CompositeDataSupport toCompositeData(GarbageCollectionRepoStats statObj) throws OpenDataException {
Object[] values = new Object[] {
statObj.getRepositoryId(),
- (statObj.getLastModified() == 0 ? "" : (new Date(statObj.getLastModified()))).toString(),
+ (statObj.getStartTime() == 0 ? "" : (new Date(statObj.getStartTime()))).toString(),
+ (statObj.getEndTime() == 0 ? "" : (new Date(statObj.getEndTime()))).toString(),
statObj.getLength(),
humanReadableByteCount(statObj.getLength()),
statObj.getNumLines()
@@ -127,15 +128,17 @@ public class BlobGC extends AnnotatedSt
private static final String[] FIELD_NAMES = new String[] {
"repositoryId",
- "referencesLastModifiedTime",
+ "markStartTime",
+ "markEndTime",
"referenceFileSizeBytes",
"referencesFileSize",
"numReferences",
};
private static final String[] FIELD_DESCRIPTIONS = new String[] {
- "Repository ID",
- "Last modified time of references",
+ "Repository ID",
+ "Start time of mark",
+ "End time of mark",
"References file size in bytes",
"References file size in human readable format",
"Number of references"
@@ -144,6 +147,7 @@ public class BlobGC extends AnnotatedSt
private static final OpenType[] FIELD_TYPES = new OpenType[] {
SimpleType.STRING,
SimpleType.STRING,
+ SimpleType.STRING,
SimpleType.LONG,
SimpleType.STRING,
SimpleType.INTEGER
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/GarbageCollectionRepoStats.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/GarbageCollectionRepoStats.java?rev=1702391&r1=1702390&r2=1702391&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/GarbageCollectionRepoStats.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/GarbageCollectionRepoStats.java Fri Sep 11 08:01:45 2015
@@ -22,7 +22,9 @@ package org.apache.jackrabbit.oak.plugin
public class GarbageCollectionRepoStats {
private String repositoryId;
- private long lastModified;
+ private long startTime;
+
+ private long endTime;
private long length;
@@ -36,12 +38,12 @@ public class GarbageCollectionRepoStats
this.repositoryId = repositoryId;
}
- public long getLastModified() {
- return lastModified;
+ public long getEndTime() {
+ return endTime;
}
- public void setLastModified(long lastModified) {
- this.lastModified = lastModified;
+ public void setEndTime(long endTime) {
+ this.endTime = endTime;
}
public long getLength() {
@@ -59,4 +61,12 @@ public class GarbageCollectionRepoStats
public int getNumLines() {
return numLines;
}
+
+ public long getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(long startTime) {
+ this.startTime = startTime;
+ }
}
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java?rev=1702391&r1=1702390&r2=1702391&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java Fri Sep 11 08:01:45 2015
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.plugins.blob;
import java.io.BufferedWriter;
+import java.io.ByteArrayInputStream;
import java.io.Closeable;
import java.io.File;
import java.io.FileInputStream;
@@ -178,6 +179,16 @@ public class MarkSweepGarbageCollector i
}
});
+ // Get all the markers available
+ List<DataRecord> markerFiles =
+ ((SharedDataStore) blobStore).getAllMetadataRecords(SharedStoreRecordType.MARKED_START_MARKER.getType());
+ Map<String, DataRecord> markers = Maps.uniqueIndex(markerFiles, new Function<DataRecord, String>() {
+ @Override
+ public String apply(DataRecord input) {
+ return SharedStoreRecordType.MARKED_START_MARKER.getIdFromName(input.getIdentifier().toString());
+ }
+ });
+
// Get all the repositories registered
List<DataRecord> repoFiles =
((SharedDataStore) blobStore).getAllMetadataRecords(SharedStoreRecordType.REPOSITORY.getType());
@@ -188,9 +199,13 @@ public class MarkSweepGarbageCollector i
stat.setRepositoryId(repoId);
if (references.containsKey(repoId)) {
DataRecord refRec = references.get(repoId);
- stat.setLastModified(refRec.getLastModified());
+ stat.setEndTime(refRec.getLastModified());
stat.setLength(refRec.getLength());
-
+
+ if (markers.containsKey(repoId)) {
+ stat.setStartTime(markers.get(repoId).getLastModified());
+ }
+
LineNumberReader reader = null;
try {
reader = new LineNumberReader(new InputStreamReader(refRec.getStream()));
@@ -242,7 +257,10 @@ public class MarkSweepGarbageCollector i
*/
private void mark(GarbageCollectorFileState fs) throws IOException, DataStoreException {
LOG.debug("Starting mark phase of the garbage collector");
-
+
+ // Create a time marker in the data store if applicable
+ GarbageCollectionType.get(blobStore).addMarkedStartMarker(blobStore, repoId);
+
// Mark all used references
iterateNodeTree(fs);
@@ -629,13 +647,14 @@ public class MarkSweepGarbageCollector i
enum GarbageCollectionType {
SHARED {
/**
- * Remove the maked references from the blob store root. Default NOOP.
+ * Remove the maked references and the marked markers from the blob store root. Default NOOP.
*
* @param blobStore the blobStore instance
*/
@Override
void removeAllMarkedReferences(GarbageCollectableBlobStore blobStore) {
((SharedDataStore) blobStore).deleteAllMetadataRecords(SharedStoreRecordType.REFERENCES.getType());
+ ((SharedDataStore) blobStore).deleteAllMetadataRecords(SharedStoreRecordType.MARKED_START_MARKER.getType());
}
/**
@@ -671,8 +690,18 @@ public class MarkSweepGarbageCollector i
}
GarbageCollectorFileState.merge(files, fs.getMarkedRefs());
+
+ // Get the timestamp to indicate the earliest mark phase start
+ List<DataRecord> markerFiles =
+ ((SharedDataStore) blobStore).getAllMetadataRecords(
+ SharedStoreRecordType.MARKED_START_MARKER.getType());
+ long earliestMarker = SharedDataStoreUtils.getEarliestRecord(markerFiles).getLastModified();
+ LOG.trace("Earliest marker timestamp {}", earliestMarker);
- return SharedDataStoreUtils.getEarliestRecord(refFiles).getLastModified();
+ long earliestRef = SharedDataStoreUtils.getEarliestRecord(refFiles).getLastModified();
+ LOG.trace("Earliest ref timestamp {}", earliestRef);
+
+ return (earliestMarker < earliestRef ? earliestMarker : earliestRef);
} else {
LOG.error("Not all repositories have marked references available : {}", unAvailRepos);
throw new IOException("Not all repositories have marked references available");
@@ -699,6 +728,17 @@ public class MarkSweepGarbageCollector i
Closeables.close(is, false);
}
}
+
+ @Override
+ public void addMarkedStartMarker(GarbageCollectableBlobStore blobStore, String repoId) {
+ try {
+ ((SharedDataStore) blobStore).addMetadataRecord(new ByteArrayInputStream(new byte[0]),
+ SharedStoreRecordType.MARKED_START_MARKER
+ .getNameFromId(repoId));
+ } catch (DataStoreException e) {
+ LOG.debug("Error creating marked time marker for repo : {}", repoId);
+ }
+ }
},
DEFAULT;
@@ -723,5 +763,7 @@ public class MarkSweepGarbageCollector i
}
return DEFAULT;
}
+
+ public void addMarkedStartMarker(GarbageCollectableBlobStore blobStore, String repoId) {}
}
}
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/SharedDataStoreUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/SharedDataStoreUtils.java?rev=1702391&r1=1702390&r2=1702391&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/SharedDataStoreUtils.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/SharedDataStoreUtils.java Fri Sep 11 08:01:45 2015
@@ -96,7 +96,7 @@ public class SharedDataStoreUtils {
* Encapsulates the different type of records at the data store root.
*/
public enum SharedStoreRecordType {
- REFERENCES("references"), REPOSITORY("repository");
+ REFERENCES("references"), REPOSITORY("repository"), MARKED_START_MARKER("markedTimestamp");
private final String type;
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStoreUtilsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStoreUtilsTest.java?rev=1702391&r1=1702390&r2=1702391&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStoreUtilsTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStoreUtilsTest.java Fri Sep 11 08:01:45 2015
@@ -67,8 +67,18 @@ public class SharedDataStoreUtilsTest {
dataStore.addMetadataRecord(new ByteArrayInputStream(new byte[0]),
SharedStoreRecordType.REPOSITORY.getNameFromId(repoId2));
DataRecord repo2 = dataStore.getMetadataRecord(SharedStoreRecordType.REPOSITORY.getNameFromId(repoId2));
-
- // Add reference records
+
+ // Add reference marker record for repo1
+ dataStore.addMetadataRecord(new ByteArrayInputStream(new byte[0]),
+ SharedStoreRecordType.MARKED_START_MARKER.getNameFromId(repoId1));
+ DataRecord markerRec1 = dataStore.getMetadataRecord(SharedStoreRecordType.MARKED_START_MARKER.getNameFromId(repoId1));
+ Assert.assertEquals(
+ SharedStoreRecordType.MARKED_START_MARKER.getIdFromName(markerRec1.getIdentifier().toString()),
+ repoId1);
+ long lastModifiedMarkerRec1 = markerRec1.getLastModified();
+ TimeUnit.MILLISECONDS.sleep(100);
+
+ // Add reference records
dataStore.addMetadataRecord(new ByteArrayInputStream(new byte[0]),
SharedStoreRecordType.REFERENCES.getNameFromId(repoId1));
DataRecord rec1 = dataStore.getMetadataRecord(SharedStoreRecordType.REFERENCES.getNameFromId(repoId1));
@@ -97,14 +107,27 @@ public class SharedDataStoreUtilsTest {
// Since, we don't care about which file specifically but only the earliest timestamped record
// Earliest time should be the min timestamp from the 2 reference files
- Assert.assertEquals(SharedDataStoreUtils
- .getEarliestRecord(dataStore.getAllMetadataRecords(SharedStoreRecordType.REFERENCES.getType()))
- .getLastModified(), (lastModifiedRec1 <= lastModifiedRec2 ? lastModifiedRec1 : lastModifiedRec2));
-
+ long minRefTime = (lastModifiedRec1 <= lastModifiedRec2 ? lastModifiedRec1 : lastModifiedRec2);
+ Assert.assertEquals(
+ SharedDataStoreUtils.getEarliestRecord(
+ dataStore.getAllMetadataRecords(SharedStoreRecordType.REFERENCES.getType())).getLastModified(),
+ minRefTime);
+
+ // the marker timestamp should be the minimum
+ long minMarkerTime =
+ SharedDataStoreUtils.getEarliestRecord(
+ dataStore.getAllMetadataRecords(SharedStoreRecordType.MARKED_START_MARKER.getType()))
+ .getLastModified();
+ Assert.assertTrue(minRefTime > minMarkerTime);
+
// Delete references and check back if deleted
dataStore.deleteAllMetadataRecords(SharedStoreRecordType.REFERENCES.getType());
Assert.assertTrue(dataStore.getAllMetadataRecords(SharedStoreRecordType.REFERENCES.getType()).isEmpty());
-
+
+ // Delete markers and check back if deleted
+ dataStore.deleteAllMetadataRecords(SharedStoreRecordType.MARKED_START_MARKER.getType());
+ Assert.assertTrue(dataStore.getAllMetadataRecords(SharedStoreRecordType.MARKED_START_MARKER.getType()).isEmpty());
+
// Repository ids should still be available
Assert.assertEquals(2,
dataStore.getAllMetadataRecords(SharedStoreRecordType.REPOSITORY.getType()).size());
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java?rev=1702391&r1=1702390&r2=1702391&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java Fri Sep 11 08:01:45 2015
@@ -155,6 +155,7 @@ public class SharedBlobStoreGCTest {
for (GarbageCollectionRepoStats stat : statsList) {
observedNumBlobs.add(stat.getNumLines());
observedRepoIds.add(stat.getRepositoryId());
+ Assert.assertTrue(stat.getStartTime() <= stat.getEndTime());
}
Assert.assertTrue(Sets.difference(actualNumBlobs, observedNumBlobs).isEmpty());