Author: frm
Date: Fri Sep 9 08:26:19 2016
New Revision: 1759951
URL: http://svn.apache.org/viewvc?rev=1759951&view=rev
Log:
OAK-4772 - Upgrade dependency to Oak to version 1.5.8
Contribution by Matt Ryan.
Modified:
jackrabbit/oak/trunk/oak-segment-tar/pom.xml
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/pom.xml?rev=1759951&r1=1759950&r2=1759951&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/pom.xml Fri Sep 9 08:26:19 2016
@@ -34,7 +34,7 @@
<name>Oak Segment Tar</name>
<properties>
- <oak.version>1.5.5</oak.version>
+ <oak.version>1.5.8</oak.version>
<netty.version>4.0.41.Final</netty.version>
</properties>
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java?rev=1759951&r1=1759950&r2=1759951&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java
Fri Sep 9 08:26:19 2016
@@ -470,9 +470,9 @@ public class SegmentDataStoreBlobGCIT {
this.maxLastModifiedInterval = maxLastModifiedInterval;
this.additionalBlobs = Sets.newHashSet();
}
-
+
@Override
- protected void markAndSweep(boolean markOnly) throws Exception {
+ protected void markAndSweep(boolean markOnly, boolean
forceBlobRetrieve) throws Exception {
boolean threw = true;
GarbageCollectorFileState fs = new GarbageCollectorFileState(root);
try {
@@ -492,8 +492,8 @@ public class SegmentDataStoreBlobGCIT {
if (!markOnly) {
Thread.sleep(maxLastModifiedInterval + 100);
LOG.info("Slept {} to make additional blobs old",
maxLastModifiedInterval + 100);
-
- long deleteCount = sweep(fs, markStart);
+
+ long deleteCount = sweep(fs, markStart, forceBlobRetrieve);
threw = false;
LOG.info("Blob garbage collection completed in {}. Number
of blobs deleted [{}]", sw.toString(),
