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 2017/10/12 09:19:41 UTC
svn commit: r1811924 -
/jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
Author: amitj
Date: Thu Oct 12 09:19:41 2017
New Revision: 1811924
URL: http://svn.apache.org/viewvc?rev=1811924&view=rev
Log:
OAK-5983: BlobGC should log the amount of space reclaimed after GC run is done
- Fixing some test failures
Modified:
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
Modified: jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java?rev=1811924&r1=1811923&r2=1811924&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java (original)
+++ jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java Thu Oct 12 09:19:41 2017
@@ -422,14 +422,12 @@ public class MarkSweepGarbageCollector i
.sweepInternal(blobStore, ids, removesQueue, maxModifiedTime);
saveBatchToFile(newArrayList(removesQueue), removesWriter);
- for(String deletedIdRow : removesQueue) {
- String strLength = Splitter.on(DELIM).trimResults().splitToList(deletedIdRow).get(1);
- if (!Strings.isNullOrEmpty(strLength)) {
- long length = Long.valueOf(strLength);
- if (length != -1) {
- deletedSize += length;
- numDeletedSizeAvailable += 1;
- }
+ for(String deletedId : removesQueue) {
+ // Estimate the size of the blob
+ long length = DataStoreBlobStore.BlobId.of(deletedId).getLength();
+ if (length != -1) {
+ deletedSize += length;
+ numDeletedSizeAvailable += 1;
}
}
removesQueue.clear();
@@ -824,13 +822,11 @@ public class MarkSweepGarbageCollector i
LOG.trace("Blob ids to be deleted {}", ids);
for (String id : ids) {
try {
- // Estimate the size of the blob
- long length = DataStoreBlobStore.BlobId.of(id).getLength();
long deleted = blobStore.countDeleteChunks(newArrayList(id), maxModified);
if (deleted != 1) {
LOG.debug("Blob [{}] not deleted", id);
} else {
- exceptionQueue.add(Joiner.on(DELIM).join(id, length));
+ exceptionQueue.add(id);
totalDeleted += 1;
}
} catch (Exception e) {