diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java index 3e139a5..7b998a6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java @@ -220,6 +220,17 @@ public class StoreFile { } /** + * Clone + */ + public StoreFile(final StoreFile other) { + this.fs = other.fs; + this.fileInfo = other.fileInfo; + this.cacheConf = other.cacheConf; + this.cfBloomType = other.cfBloomType; + this.modificationTimeStamp = other.modificationTimeStamp; + } + + /** * @return the StoreFile object associated to this StoreFile. * null if the StoreFile is not a reference. */ diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DefaultCompactor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DefaultCompactor.java index aae3968..cc03e09 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DefaultCompactor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DefaultCompactor.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.InterruptedIOException; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.apache.hadoop.hbase.classification.InterfaceAudience; @@ -50,7 +51,21 @@ public class DefaultCompactor extends Compactor { // Find the smallest read point across all the Scanners. long smallestReadPoint = getSmallestReadPoint(); - List scanners = createFileScanners(request.getFiles(), smallestReadPoint); + + List scanners; + Collection readersToClose; + if (this.conf.getBoolean("hbase.regionserver.compaction.private.readers", false)) { + // clone all StoreFiles, so we'll do the compaction on a independent copy of StoreFiles, + // HFileFiles, and their readers + readersToClose = new ArrayList(request.getFiles().size()); + for (StoreFile f : request.getFiles()) { + readersToClose.add(new StoreFile(f)); + } + scanners = createFileScanners(readersToClose, smallestReadPoint); + } else { + readersToClose = Collections.emptyList(); + scanners = createFileScanners(request.getFiles(), smallestReadPoint); + } StoreFile.Writer writer = null; List newFiles = new ArrayList(); @@ -99,13 +114,19 @@ public class DefaultCompactor extends Compactor { throw ioe; } finally { - if (writer != null) { - if (e != null) { - writer.close(); - } else { - writer.appendMetadata(fd.maxSeqId, request.isAllFiles()); - writer.close(); - newFiles.add(writer.getPath()); + try { + if (writer != null) { + if (e != null) { + writer.close(); + } else { + writer.appendMetadata(fd.maxSeqId, request.isAllFiles()); + writer.close(); + newFiles.add(writer.getPath()); + } + } + } finally { + for (StoreFile f : readersToClose) { + f.closeReader(true); } } }