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/02 11:21:58 UTC
svn commit: r1700743 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCTest.java
Author: amitj
Date: Wed Sep 2 09:21:58 2015
New Revision: 1700743
URL: http://svn.apache.org/r1700743
Log:
OAK-3312: [Blob GC] Test case for GC / OAK-3167
Merged revision 1700727 from trunk
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 2 09:21:58 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
+/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,1700727
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java?rev=1700743&r1=1700742&r2=1700743&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java Wed Sep 2 09:21:58 2015
@@ -33,7 +33,6 @@ import java.util.concurrent.TimeUnit;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.MoreExecutors;
import com.mongodb.BasicDBObject;
import com.mongodb.DBCollection;
import junit.framework.Assert;
@@ -56,9 +55,7 @@ import org.junit.Test;
public class MongoBlobGCTest extends AbstractMongoConnectionTest {
private Clock clock;
- public HashSet<String> setUp(boolean deleteDirect) throws Exception {
- HashSet<String> set = new HashSet<String>();
-
+ public DataStoreState setUp(boolean deleteDirect) throws Exception {
DocumentNodeStore s = mk.getNodeStore();
NodeBuilder a = s.getRoot().builder();
@@ -73,14 +70,18 @@ public class MongoBlobGCTest extends Abs
processed.add(n);
}
}
+
+ DataStoreState state = new DataStoreState();
for (int i = 0; i < number; i++) {
Blob b = s.createBlob(randomStream(i, 16516));
- if (!processed.contains(i)) {
- Iterator<String> idIter =
- ((GarbageCollectableBlobStore) s.getBlobStore())
- .resolveChunks(b.toString());
- while (idIter.hasNext()) {
- set.add(idIter.next());
+ Iterator<String> idIter =
+ ((GarbageCollectableBlobStore) s.getBlobStore())
+ .resolveChunks(b.toString());
+ while (idIter.hasNext()) {
+ String chunk = idIter.next();
+ state.blobsAdded.add(chunk);
+ if (!processed.contains(i)) {
+ state.blobsPresent.add(chunk);
}
}
a.child("c" + i).setProperty("x", b);
@@ -106,9 +107,14 @@ public class MongoBlobGCTest extends Abs
Assert.assertEquals(processed.size(), stats.deletedDocGCCount);
}
- return set;
+ return state;
}
-
+
+ private class DataStoreState {
+ Set<String> blobsAdded = Sets.newHashSet();
+ Set<String> blobsPresent = Sets.newHashSet();
+ }
+
public HashSet<String> addInlined() throws Exception {
HashSet<String> set = new HashSet<String>();
DocumentNodeStore s = mk.getNodeStore();
@@ -130,29 +136,41 @@ public class MongoBlobGCTest extends Abs
@Test
public void gcDirectMongoDelete() throws Exception {
- HashSet<String> set = setUp(true);
- gc(set);
+ DataStoreState state = setUp(true);
+ Set<String> existingAfterGC = gc(0);
+ assertTrue(Sets.symmetricDifference(state.blobsPresent, existingAfterGC).isEmpty());
}
+
+ @Test
+ public void noGc() throws Exception {
+ DataStoreState state = setUp(true);
+ Set<String> existingAfterGC = gc(86400);
+ assertTrue(Sets.symmetricDifference(state.blobsAdded, existingAfterGC).isEmpty());
+ }
@Test
public void gcVersionDelete() throws Exception {
- HashSet<String> set = setUp(false);
- gc(set);
+ DataStoreState state = setUp(false);
+ Set<String> existingAfterGC = gc(0);
+ assertTrue(Sets.symmetricDifference(state.blobsPresent, existingAfterGC).isEmpty());
}
@Test
public void gcDirectMongoDeleteWithInlined() throws Exception {
- HashSet<String> set = setUp(true);
+ DataStoreState state = setUp(true);
addInlined();
- gc(set);
+ Set<String> existingAfterGC = gc(0);
+ assertTrue(Sets.symmetricDifference(state.blobsPresent, existingAfterGC).isEmpty());
}
@Test
public void gcVersionDeleteWithInlined() throws Exception {
- HashSet<String> set = setUp(false);
+ DataStoreState state = setUp(false);
addInlined();
- gc(set);
+ Set<String> existingAfterGC = gc(0);
+ assertTrue(Sets.symmetricDifference(state.blobsPresent, existingAfterGC).isEmpty());
}
- private void gc(HashSet<String> remaining) throws Exception {
+
+ private Set<String> gc(int blobGcMaxAgeInSecs) throws Exception {
DocumentNodeStore store = mk.getNodeStore();
String repoId = null;
if (SharedDataStoreUtils.isShared(store.getBlobStore())) {
@@ -164,14 +182,11 @@ public class MongoBlobGCTest extends Abs
ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(10);
MarkSweepGarbageCollector gc = new MarkSweepGarbageCollector(
new DocumentBlobReferenceRetriever(store),
- (GarbageCollectableBlobStore) store.getBlobStore(), executor, "./target", 5, 0, repoId);
- Thread.sleep(4000);
+ (GarbageCollectableBlobStore) store.getBlobStore(), executor, "./target", 5, blobGcMaxAgeInSecs, repoId);
gc.collectGarbage(false);
assertEquals(0, executor.getTaskCount());
- Set<String> existingAfterGC = iterate();
- boolean empty = Sets.symmetricDifference(remaining, existingAfterGC).isEmpty();
- assertTrue(empty);
+ return iterate();
}
protected Set<String> iterate() throws Exception {
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCTest.java?rev=1700743&r1=1700742&r2=1700743&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCTest.java Wed Sep 2 09:21:58 2015
@@ -40,8 +40,6 @@ import java.util.concurrent.TimeUnit;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-
-import com.google.common.util.concurrent.MoreExecutors;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.blob.MarkSweepGarbageCollector;
@@ -96,17 +94,15 @@ public class SegmentDataStoreBlobGCTest
return new File("target", "DataStoreBlobGCTest");
}
- public HashSet<String> setUp() throws Exception {
+ public DataStoreState setUp() throws Exception {
blobStore = DataStoreUtils.getBlobStore();
nodeStore = getNodeStore(blobStore);
startDate = new Date();
-
- HashSet<String> set = new HashSet<String>();
-
+
NodeBuilder a = nodeStore.getRoot().builder();
/* Create garbage by creating in-lined blobs (size < 16KB) */
- int number = 10000;
+ int number = 4000;
NodeBuilder content = a.child("content");
for (int i = 0; i < number; i++) {
NodeBuilder c = content.child("x" + i);
@@ -131,32 +127,32 @@ public class SegmentDataStoreBlobGCTest
/* Create and delete nodes with blobs stored in DS*/
int maxDeleted = 5;
- number = 10;
- // track the number of the assets to be deleted
+ int numBlobs = 10;
List<Integer> processed = Lists.newArrayList();
Random rand = new Random();
for (int i = 0; i < maxDeleted; i++) {
- int n = rand.nextInt(number);
+ int n = rand.nextInt(numBlobs);
if (!processed.contains(n)) {
processed.add(n);
}
}
-
- List<String> createdBlobs = Lists.newArrayList();
- for (int i = 0; i < number; i++) {
+
+ DataStoreState state = new DataStoreState();
+ for (int i = 0; i < numBlobs; i++) {
SegmentBlob b = (SegmentBlob) nodeStore.createBlob(randomStream(i, 16516));
- createdBlobs.add(b.getBlobId());
- if (!processed.contains(i)) {
- Iterator<String> idIter = blobStore
- .resolveChunks(b.getBlobId());
- while (idIter.hasNext()) {
- set.add(idIter.next());
+ Iterator<String> idIter = blobStore.resolveChunks(b.getBlobId());
+ while (idIter.hasNext()) {
+ String chunk = idIter.next();
+ state.blobsAdded.add(chunk);
+ if (!processed.contains(i)) {
+ state.blobsPresent.add(chunk);
}
}
a.child("c" + i).setProperty("x", b);
}
+
nodeStore.merge(a, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- log.info("Created blobs : {}", createdBlobs.size());
+ log.info("Created blobs : {}", state.blobsAdded.size());
for (int id : processed) {
delete("c" + id);
@@ -168,19 +164,40 @@ public class SegmentDataStoreBlobGCTest
store.maybeCompact(false);
store.cleanup();
- return set;
+ return state;
}
-
+
+ private class DataStoreState {
+ Set<String> blobsAdded = Sets.newHashSet();
+ Set<String> blobsPresent = Sets.newHashSet();
+ }
+
private void delete(String nodeId) throws CommitFailedException {
NodeBuilder builder = nodeStore.getRoot().builder();
builder.child(nodeId).remove();
nodeStore.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
}
-
+
@Test
public void gc() throws Exception {
- HashSet<String> remaining = setUp();
+ DataStoreState state = setUp();
+ log.info("{} blobs that should remain after gc : {}", state.blobsPresent.size(), state.blobsPresent);
+ log.info("{} blobs for nodes which are deleted : {}", state.blobsPresent.size(), state.blobsPresent);
+ Set<String> existingAfterGC = gcInternal(0);
+ assertTrue(Sets.symmetricDifference(state.blobsPresent, existingAfterGC).isEmpty());
+ }
+
+ @Test
+ public void noGc() throws Exception {
+ DataStoreState state = setUp();
+ log.info("{} blobs that should remain after gc : {}", state.blobsAdded.size(), state.blobsAdded);
+ log.info("{} blobs for nodes which are deleted : {}", state.blobsPresent.size(), state.blobsPresent);
+ Set<String> existingAfterGC = gcInternal(86400);
+ assertTrue(Sets.symmetricDifference(state.blobsAdded, existingAfterGC).isEmpty());
+ }
+
+ private Set<String> gcInternal(long maxBlobGcInSecs) throws Exception {
String repoId = null;
if (SharedDataStoreUtils.isShared(store.getBlobStore())) {
repoId = ClusterRepositoryInfo.createId(nodeStore);
@@ -192,16 +209,14 @@ public class SegmentDataStoreBlobGCTest
ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(10);
MarkSweepGarbageCollector gc = new MarkSweepGarbageCollector(
new SegmentBlobReferenceRetriever(store.getTracker()),
- (GarbageCollectableBlobStore) store.getBlobStore(), executor,
- "./target", 2048, 0, repoId);
+ (GarbageCollectableBlobStore) store.getBlobStore(), executor, "./target", 2048, maxBlobGcInSecs,
+ repoId);
gc.collectGarbage(false);
assertEquals(0, executor.getTaskCount());
Set<String> existingAfterGC = iterate();
- log.info("{} blobs that should have remained after gc : {}", remaining.size(), remaining);
log.info("{} blobs existing after gc : {}", existingAfterGC.size(), existingAfterGC);
-
- assertTrue(Sets.symmetricDifference(remaining, existingAfterGC).isEmpty());
+ return existingAfterGC;
}
protected Set<String> iterate() throws Exception {