Author: reschke
Date: Mon Jul 1 13:58:04 2019
New Revision: 1862380
URL: http://svn.apache.org/viewvc?rev=1862380&view=rev
Log:
OAK-8446: Enable datastore consistency check after completion of garbage
collection
close (another) FileReader when done
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=1862380&r1=1862379&r2=1862380&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
Mon Jul 1 13:58:04 2019
@@ -720,9 +720,10 @@ public class MarkSweepGarbageCollector i
LOG.info("Consistency check found [{}] missing blobs", candidates);
if (candidates > 0) {
- LineIterator lineIterator = new LineIterator(new
FileReader(fs.getGcCandidates()));
- while(lineIterator.hasNext()) {
- LOG.warn("Missing Blob [{}]", lineIterator.nextLine());
+ try (LineIterator lineIterator = new LineIterator(new
FileReader(fs.getGcCandidates()))) {
+ while(lineIterator.hasNext()) {
+ LOG.warn("Missing Blob [{}]", lineIterator.nextLine());
+ }
}
LOG.warn("Consistency check failure in the the blob store :
{}, check missing candidates in file {}",
blobStore, fs.getGcCandidates().getAbsolutePath());