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 md...@apache.org on 2016/08/18 08:16:12 UTC
svn commit: r1756737 -
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
Author: mduerig
Date: Thu Aug 18 08:16:11 2016
New Revision: 1756737
URL: http://svn.apache.org/viewvc?rev=1756737&view=rev
Log:
OAK-4106: Reclaimed size reported by FileStore.cleanup is off
Correct reclaimed size calculation by consistently only looking at the tar readers
Credits to Andrei Dulceanu for the patch
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1756737&r1=1756736&r2=1756737&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java Thu Aug 18 08:16:11 2016
@@ -760,6 +760,7 @@ public class FileStore implements Segmen
Set<UUID> bulkRefs = newHashSet();
Map<TarReader, TarReader> cleaned = newLinkedHashMap();
+ long initialSize = 0;
fileStoreLock.writeLock().lock();
try {
gcListener.info("TarMK GC #{}: cleanup started.", GC_COUNT);
@@ -778,13 +779,12 @@ public class FileStore implements Segmen
}
for (TarReader reader : readers) {
cleaned.put(reader, reader);
+ initialSize += reader.size();
}
} finally {
fileStoreLock.writeLock().unlock();
}
- // compute initial size here to better reflect repository size after the previous tar writer was closed
- long initialSize = size();
gcListener.info("TarMK GC #{}: current repository size is {} ({} bytes)",
GC_COUNT, humanReadableByteCount(initialSize), initialSize);