From 6fbfd3ee6f15ec57e02c3604d53aea8ead634935 Mon Sep 17 00:00:00 2001 From: Guanghao Zhang Date: Tue, 19 Feb 2019 20:50:37 +0800 Subject: [PATCH] HBASE-20724 Sometimes some compacted storefiles are still opened after region failover --- .../hadoop/hbase/shaded/protobuf/ProtobufUtil.java | 24 +++ .../src/main/protobuf/HFile.proto | 4 + .../hadoop/hbase/io/hfile/FixedFileTrailer.java | 7 +- .../hadoop/hbase/io/hfile/HFileWriterImpl.java | 1 - .../regionserver/AbstractMultiFileWriter.java | 13 +- .../apache/hadoop/hbase/regionserver/HStore.java | 61 +++----- .../hadoop/hbase/regionserver/HStoreFile.java | 58 ++++---- .../hadoop/hbase/regionserver/StoreFileReader.java | 27 +--- .../hadoop/hbase/regionserver/StoreFileWriter.java | 23 +++ .../compactions/DateTieredCompactor.java | 2 +- .../regionserver/compactions/DefaultCompactor.java | 2 +- .../regionserver/compactions/StripeCompactor.java | 2 +- .../TestCleanupCompactedFileAfterFailover.java | 165 +++++++++++++++++++++ .../TestCleanupCompactedFileOnRegionClose.java | 60 -------- .../hbase/regionserver/TestSwitchToStreamRead.java | 49 ------ .../regionserver/compactions/TestCompactor.java | 8 + 16 files changed, 290 insertions(+), 216 deletions(-) create mode 100644 hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCleanupCompactedFileAfterFailover.java diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java index a227a8f..08dbfc4 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java @@ -35,6 +35,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.NavigableSet; import java.util.Optional; +import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.function.Function; @@ -162,6 +163,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionInfo; import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier; import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier.RegionSpecifierType; import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.TableSchema; +import org.apache.hadoop.hbase.shaded.protobuf.generated.HFileProtos; import org.apache.hadoop.hbase.shaded.protobuf.generated.LockServiceProtos; import org.apache.hadoop.hbase.shaded.protobuf.generated.MapReduceProtos; import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos; @@ -3264,4 +3266,26 @@ public final class ProtobufUtil { .setTo(timeRange.getMax()) .build(); } + + public static byte[] toCompactedStoreFilesTrackerBytes(Set storeFiles) { + HFileProtos.CompactedStoreFilesTracker.Builder builder = + HFileProtos.CompactedStoreFilesTracker.newBuilder(); + storeFiles.forEach(sf -> builder.addStoreFileName(ByteString.copyFromUtf8(sf))); + return ProtobufUtil.prependPBMagic(builder.build().toByteArray()); + } + + public static Set toCompactedStoreFiles(byte[] bytes) throws IOException { + if (bytes != null && ProtobufUtil.isPBMagicPrefix(bytes)) { + int pbLen = ProtobufUtil.lengthOfPBMagic(); + HFileProtos.CompactedStoreFilesTracker.Builder builder = + HFileProtos.CompactedStoreFilesTracker.newBuilder(); + ProtobufUtil.mergeFrom(builder, bytes, pbLen, bytes.length - pbLen); + HFileProtos.CompactedStoreFilesTracker compactedStoreFilesTracker = builder.build(); + List storeFileNameList = compactedStoreFilesTracker.getStoreFileNameList(); + if (storeFileNameList != null && storeFileNameList.size() != 0) { + return storeFileNameList.stream().map(ByteString::toStringUtf8).collect(Collectors.toSet()); + } + } + return Collections.emptySet(); + } } diff --git a/hbase-protocol-shaded/src/main/protobuf/HFile.proto b/hbase-protocol-shaded/src/main/protobuf/HFile.proto index 33f89a2..8cd951c 100644 --- a/hbase-protocol-shaded/src/main/protobuf/HFile.proto +++ b/hbase-protocol-shaded/src/main/protobuf/HFile.proto @@ -27,6 +27,10 @@ option optimize_for = SPEED; import "HBase.proto"; +message CompactedStoreFilesTracker { + repeated bytes store_file_name = 1; +} + // Map of name/values message FileInfoProto { repeated BytesBytesPair map_entry = 1; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java index 3c74d11..30a99b5 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java @@ -18,7 +18,6 @@ */ package org.apache.hadoop.hbase.io.hfile; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataInput; @@ -32,15 +31,15 @@ import org.apache.hadoop.hbase.CellComparator; import org.apache.hadoop.hbase.CellComparatorImpl; import org.apache.hadoop.hbase.CellComparatorImpl.MetaCellComparator; import org.apache.hadoop.hbase.KeyValue; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.io.compress.Compression; -import org.apache.hbase.thirdparty.com.google.protobuf.UnsafeByteOperations; import org.apache.hadoop.hbase.shaded.protobuf.generated.HFileProtos; import org.apache.hadoop.hbase.util.Bytes; - +import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.hbase.thirdparty.com.google.protobuf.UnsafeByteOperations; + /** * The {@link HFile} has a fixed trailer which contains offsets to other * variable parts of the file. Also includes basic metadata on this file. The diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterImpl.java index 2726977..f604349 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterImpl.java @@ -666,7 +666,6 @@ public class HFileWriterImpl implements HFile.Writer { trailer.setComparatorClass(comparator.getClass()); trailer.setDataIndexCount(dataBlockIndexWriter.getNumRootEntries()); - finishClose(trailer); blockWriter.release(); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMultiFileWriter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMultiFileWriter.java index 43d0ad8..f9cc400 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMultiFileWriter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMultiFileWriter.java @@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.regionserver; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.apache.hadoop.fs.Path; import org.apache.yetus.audience.InterfaceAudience; @@ -62,18 +63,24 @@ public abstract class AbstractMultiFileWriter implements CellSink, ShipperListen * comments in HBASE-15400 for more details. */ public List commitWriters(long maxSeqId, boolean majorCompaction) throws IOException { + return commitWriters(maxSeqId, majorCompaction, Collections.EMPTY_SET); + } + + public List commitWriters(long maxSeqId, boolean majorCompaction, + Collection storeFiles) throws IOException { preCommitWriters(); Collection writers = this.writers(); if (LOG.isDebugEnabled()) { - LOG.debug("Commit " + writers.size() + " writers, maxSeqId=" + maxSeqId - + ", majorCompaction=" + majorCompaction); + LOG.debug( + "Commit " + writers.size() + " writers, maxSeqId=" + maxSeqId + ", majorCompaction=" + + majorCompaction); } List paths = new ArrayList<>(); for (StoreFileWriter writer : writers) { if (writer == null) { continue; } - writer.appendMetadata(maxSeqId, majorCompaction); + writer.appendMetadata(maxSeqId, majorCompaction, storeFiles); preCloseWriter(writer); paths.add(writer.getPath()); writer.close(); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java index 5056ad7..4c86f1f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java @@ -577,6 +577,7 @@ public class HStore implements Store, HeapSize, StoreConfigInformation, Propagat totalValidStoreFile++; } + Set compactedStoreFiles = new HashSet<>(); ArrayList results = new ArrayList<>(files.size()); IOException ioe = null; try { @@ -586,6 +587,7 @@ public class HStore implements Store, HeapSize, StoreConfigInformation, Propagat if (storeFile != null) { LOG.debug("loaded {}", storeFile); results.add(storeFile); + compactedStoreFiles.addAll(storeFile.getCompactedStoreFiles()); } } catch (InterruptedException e) { if (ioe == null) ioe = new InterruptedIOException(e.getMessage()); @@ -612,6 +614,21 @@ public class HStore implements Store, HeapSize, StoreConfigInformation, Propagat throw ioe; } + // Remove the compacted files from result + List filesToRemove = new ArrayList<>(compactedStoreFiles.size()); + for (HStoreFile storeFile : results) { + if (compactedStoreFiles.contains(storeFile.getPath().getName())) { + LOG.warn("Clearing the compacted storefile {} from this store", storeFile); + storeFile.getReader().close(true); + filesToRemove.add(storeFile); + } + } + results.removeAll(filesToRemove); + if (!filesToRemove.isEmpty() && this.isPrimaryReplicaStore()) { + LOG.debug("Moving the files {} to archive", filesToRemove); + this.fs.removeStoreFiles(this.getColumnFamilyDescriptor().getNameAsString(), filesToRemove); + } + return results; } @@ -933,7 +950,7 @@ public class HStore implements Store, HeapSize, StoreConfigInformation, Propagat storeEngine.getStoreFileManager().clearCompactedFiles(); // clear the compacted files if (CollectionUtils.isNotEmpty(compactedfiles)) { - removeCompactedfiles(compactedfiles, true); + removeCompactedfiles(compactedfiles); } if (!result.isEmpty()) { // initialize the thread pool for closing store files in parallel. @@ -2570,11 +2587,6 @@ public class HStore implements Store, HeapSize, StoreConfigInformation, Propagat * Closes and archives the compacted files under this store */ public synchronized void closeAndArchiveCompactedFiles() throws IOException { - closeAndArchiveCompactedFiles(false); - } - - @VisibleForTesting - public synchronized void closeAndArchiveCompactedFiles(boolean storeClosing) throws IOException { // ensure other threads do not attempt to archive the same files on close() archiveLock.lock(); try { @@ -2593,7 +2605,7 @@ public class HStore implements Store, HeapSize, StoreConfigInformation, Propagat lock.readLock().unlock(); } if (CollectionUtils.isNotEmpty(copyCompactedfiles)) { - removeCompactedfiles(copyCompactedfiles, storeClosing); + removeCompactedfiles(copyCompactedfiles); } } finally { archiveLock.unlock(); @@ -2604,7 +2616,7 @@ public class HStore implements Store, HeapSize, StoreConfigInformation, Propagat * Archives and removes the compacted files * @param compactedfiles The compacted files in this store that are not active in reads */ - private void removeCompactedfiles(Collection compactedfiles, boolean storeClosing) + private void removeCompactedfiles(Collection compactedfiles) throws IOException { final List filesToRemove = new ArrayList<>(compactedfiles.size()); final List storeFileSizes = new ArrayList<>(compactedfiles.size()); @@ -2623,30 +2635,13 @@ public class HStore implements Store, HeapSize, StoreConfigInformation, Propagat continue; } - //Compacted files in the list should always be marked compacted away. In the event - //they're contradicting in order to guarantee data consistency - //should we choose one and ignore the other? - if (storeClosing && !file.isCompactedAway()) { - String msg = - "Region closing but StoreFile is in compacted list but not compacted away: " + - file.getPath(); - throw new IllegalStateException(msg); - } - - //If store is closing we're ignoring any references to keep things consistent - //and remove compacted storefiles from the region directory - if (file.isCompactedAway() && (!file.isReferencedInReads() || storeClosing)) { - if (storeClosing && file.isReferencedInReads()) { - LOG.warn("Region closing but StoreFile still has references: file={}, refCount={}", - file.getPath(), r.getRefCount()); - } + if (file.isCompactedAway() && !file.isReferencedInReads()) { // Even if deleting fails we need not bother as any new scanners won't be // able to use the compacted file as the status is already compactedAway LOG.trace("Closing and archiving the file {}", file); // Copy the file size before closing the reader final long length = r.length(); r.close(true); - file.closeStreamReaders(true); // Just close and return filesToRemove.add(file); // Only add the length if we successfully added the file to `filesToRemove` @@ -2658,16 +2653,8 @@ public class HStore implements Store, HeapSize, StoreConfigInformation, Propagat + ", refCount=" + r.getRefCount() + ", skipping for now."); } } catch (Exception e) { - String msg = "Exception while trying to close the compacted store file " + - file.getPath(); - if (storeClosing) { - msg = "Store is closing. " + msg; - } - LOG.error(msg, e); - //if we get an exception let caller know so it can abort the server - if (storeClosing) { - throw new IOException(msg, e); - } + LOG.error("Exception while trying to close the compacted store file {}", file.getPath(), + e); } } } @@ -2780,8 +2767,8 @@ public class HStore implements Store, HeapSize, StoreConfigInformation, Propagat } } + @Override public int getCurrentParallelPutCount() { return currentParallelPutCount.get(); } - } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java index 9c94990..0b4fbc0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java @@ -20,11 +20,11 @@ package org.apache.hadoop.hbase.regionserver; import java.io.IOException; import java.util.Collections; +import java.util.HashSet; import java.util.Map; import java.util.Optional; import java.util.OptionalLong; import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -40,14 +40,13 @@ import org.apache.hadoop.hbase.io.hfile.CacheConfig; import org.apache.hadoop.hbase.io.hfile.HFile; import org.apache.hadoop.hbase.util.BloomFilterFactory; import org.apache.hadoop.hbase.util.Bytes; - import org.apache.yetus.audience.InterfaceAudience; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; -import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; +import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; /** * A Store data file. Stores usually have one or more of these files. They @@ -63,7 +62,7 @@ import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; * writer and a reader is that we write once but read a lot more. */ @InterfaceAudience.Private -public class HStoreFile implements StoreFile, StoreFileReader.Listener { +public class HStoreFile implements StoreFile { private static final Logger LOG = LoggerFactory.getLogger(HStoreFile.class.getName()); @@ -83,6 +82,11 @@ public class HStoreFile implements StoreFile, StoreFileReader.Listener { public static final byte[] EXCLUDE_FROM_MINOR_COMPACTION_KEY = Bytes.toBytes("EXCLUDE_FROM_MINOR_COMPACTION"); + /** + * Key for compacted storefiles in FileInfo + */ + public static final byte[] COMPACTED_STOREFILE_KEY = Bytes.toBytes("COMPACTED_STOREFILE_KEY"); + /** Bloom filter Type in FileInfo */ public static final byte[] BLOOM_FILTER_TYPE_KEY = Bytes.toBytes("BLOOM_FILTER_TYPE"); @@ -125,10 +129,6 @@ public class HStoreFile implements StoreFile, StoreFileReader.Listener { // done. private final AtomicInteger refCount = new AtomicInteger(0); - // Set implementation must be of concurrent type - @VisibleForTesting - final Set streamReaders; - private final boolean noReadahead; private final boolean primaryReplica; @@ -183,6 +183,9 @@ public class HStoreFile implements StoreFile, StoreFileReader.Listener { // It's set whenever you get a Reader. private boolean excludeFromMinorCompaction = false; + // This file was product of these compacted store files + private final Set compactedStoreFiles = new HashSet<>(); + /** * Map of the metadata entries in the corresponding HFile. Populated when Reader is opened * after which it is not modified again. @@ -232,7 +235,6 @@ public class HStoreFile implements StoreFile, StoreFileReader.Listener { */ public HStoreFile(FileSystem fs, StoreFileInfo fileInfo, Configuration conf, CacheConfig cacheConf, BloomType cfBloomType, boolean primaryReplica) { - this.streamReaders = ConcurrentHashMap.newKeySet(); this.fs = fs; this.fileInfo = fileInfo; this.cacheConf = cacheConf; @@ -464,6 +466,14 @@ public class HStoreFile implements StoreFile, StoreFileReader.Listener { "proceeding without", e); this.reader.timeRange = null; } + + try { + byte[] data = metadataMap.get(COMPACTED_STOREFILE_KEY); + this.compactedStoreFiles.addAll(ProtobufUtil.toCompactedStoreFiles(data)); + } catch (IOException e) { + LOG.error("Error reading compacted storefiles from meta data", e); + } + // initialize so we can reuse them after reader closed. firstKey = reader.getFirstKey(); lastKey = reader.getLastKey(); @@ -516,13 +526,9 @@ public class HStoreFile implements StoreFile, StoreFileReader.Listener { public StoreFileScanner getStreamScanner(boolean canUseDropBehind, boolean cacheBlocks, boolean isCompaction, long readPt, long scannerOrder, boolean canOptimizeForNonNullColumn) throws IOException { - StoreFileReader reader = createStreamReader(canUseDropBehind); - reader.setListener(this); - StoreFileScanner sfScanner = reader.getStoreFileScanner(cacheBlocks, false, - isCompaction, readPt, scannerOrder, canOptimizeForNonNullColumn); - //Add reader once the scanner is created - streamReaders.add(reader); - return sfScanner; + return createStreamReader(canUseDropBehind) + .getStoreFileScanner(cacheBlocks, false, isCompaction, readPt, scannerOrder, + canOptimizeForNonNullColumn); } /** @@ -542,19 +548,6 @@ public class HStoreFile implements StoreFile, StoreFileReader.Listener { this.reader.close(evictOnClose); this.reader = null; } - closeStreamReaders(evictOnClose); - } - - public void closeStreamReaders(boolean evictOnClose) throws IOException { - synchronized (this) { - for (StoreFileReader entry : streamReaders) { - //closing the reader will remove itself from streamReaders thanks to the Listener - entry.close(evictOnClose); - } - int size = streamReaders.size(); - Preconditions.checkState(size == 0, - "There are still streamReaders post close: " + size); - } } /** @@ -622,8 +615,7 @@ public class HStoreFile implements StoreFile, StoreFileReader.Listener { return tr != null ? OptionalLong.of(tr.getMax()) : OptionalLong.empty(); } - @Override - public void storeFileReaderClosed(StoreFileReader reader) { - streamReaders.remove(reader); + Set getCompactedStoreFiles() { + return this.compactedStoreFiles; } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileReader.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileReader.java index d9008b2..825c406 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileReader.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileReader.java @@ -88,10 +88,6 @@ public class StoreFileReader { @VisibleForTesting final boolean shared; - private volatile Listener listener; - - private boolean closed = false; - private StoreFileReader(HFile.Reader reader, AtomicInteger refCount, boolean shared) { this.reader = reader; bloomFilterType = BloomType.NONE; @@ -186,9 +182,6 @@ public class StoreFileReader { if (!shared) { try { reader.close(false); - if (this.listener != null) { - this.listener.storeFileReaderClosed(this); - } } catch (IOException e) { LOG.warn("failed to close stream reader", e); } @@ -229,16 +222,7 @@ public class StoreFileReader { } public void close(boolean evictOnClose) throws IOException { - synchronized (this) { - if (closed) { - return; - } - reader.close(evictOnClose); - closed = true; - } - if (listener != null) { - listener.storeFileReaderClosed(this); - } + reader.close(evictOnClose); } /** @@ -754,15 +738,6 @@ public class StoreFileReader { this.skipResetSeqId = skipResetSeqId; } - public void setListener(Listener listener) { - this.listener = listener; - } - - public interface Listener { - void storeFileReaderClosed(StoreFileReader reader); - } - - public int getPrefixLength() { return prefixLength; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileWriter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileWriter.java index b31df39..a04a4c0 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileWriter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileWriter.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.regionserver; import static org.apache.hadoop.hbase.regionserver.HStoreFile.BLOOM_FILTER_PARAM_KEY; import static org.apache.hadoop.hbase.regionserver.HStoreFile.BLOOM_FILTER_TYPE_KEY; +import static org.apache.hadoop.hbase.regionserver.HStoreFile.COMPACTED_STOREFILE_KEY; import static org.apache.hadoop.hbase.regionserver.HStoreFile.DELETE_FAMILY_COUNT; import static org.apache.hadoop.hbase.regionserver.HStoreFile.EARLIEST_PUT_TS; import static org.apache.hadoop.hbase.regionserver.HStoreFile.MAJOR_COMPACTION_KEY; @@ -28,8 +29,11 @@ import static org.apache.hadoop.hbase.regionserver.HStoreFile.TIMERANGE_KEY; import java.io.IOException; import java.net.InetSocketAddress; +import java.util.Collection; +import java.util.Collections; import java.util.UUID; import java.util.regex.Pattern; +import java.util.stream.Collectors; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; @@ -56,8 +60,11 @@ import org.apache.hadoop.hbase.util.RowPrefixFixedLengthBloomContext; import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; +import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; + /** * A StoreFile writer. Use this to read/write HBase Store Files. It is package * local because it is an implementation detail of the HBase regionserver. @@ -172,8 +179,24 @@ public class StoreFileWriter implements CellSink, ShipperListener { */ public void appendMetadata(final long maxSequenceId, final boolean majorCompaction) throws IOException { + appendMetadata(maxSequenceId, majorCompaction, Collections.emptySet()); + } + + /** + * Writes meta data. + * Call before {@link #close()} since its written as meta data to this file. + * @param maxSequenceId Maximum sequence id. + * @param majorCompaction True if this file is product of a major compaction + * @param storeFiles The compacted store files to generate this new file + * @throws IOException problem writing to FS + */ + public void appendMetadata(final long maxSequenceId, final boolean majorCompaction, + final Collection storeFiles) throws IOException { writer.appendFileInfo(MAX_SEQ_ID_KEY, Bytes.toBytes(maxSequenceId)); writer.appendFileInfo(MAJOR_COMPACTION_KEY, Bytes.toBytes(majorCompaction)); + writer.appendFileInfo(COMPACTED_STOREFILE_KEY, ProtobufUtil.toCompactedStoreFilesTrackerBytes( + storeFiles.stream().map(sf -> sf.getFileInfo().getPath().getName()) + .collect(Collectors.toSet()))); appendTrackedTimestampsToMetadata(); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DateTieredCompactor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DateTieredCompactor.java index 21eaa94..1bf5236 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DateTieredCompactor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DateTieredCompactor.java @@ -78,6 +78,6 @@ public class DateTieredCompactor extends AbstractMultiOutputCompactor commitWriter(DateTieredMultiFileWriter writer, FileDetails fd, CompactionRequestImpl request) throws IOException { - return writer.commitWriters(fd.maxSeqId, request.isAllFiles()); + return writer.commitWriters(fd.maxSeqId, request.isAllFiles(), request.getFiles()); } } 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 7a398ea..ac6a7dc 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 @@ -86,7 +86,7 @@ public class DefaultCompactor extends Compactor { protected List commitWriter(StoreFileWriter writer, FileDetails fd, CompactionRequestImpl request) throws IOException { List newFiles = Lists.newArrayList(writer.getPath()); - writer.appendMetadata(fd.maxSeqId, request.isAllFiles()); + writer.appendMetadata(fd.maxSeqId, request.isAllFiles(), request.getFiles()); writer.close(); return newFiles; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/StripeCompactor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/StripeCompactor.java index 41e0a71..fe07d9e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/StripeCompactor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/StripeCompactor.java @@ -127,7 +127,7 @@ public class StripeCompactor extends AbstractMultiOutputCompactor commitWriter(StripeMultiFileWriter writer, FileDetails fd, CompactionRequestImpl request) throws IOException { - List newFiles = writer.commitWriters(fd.maxSeqId, request.isMajor()); + List newFiles = writer.commitWriters(fd.maxSeqId, request.isMajor(), request.getFiles()); assert !newFiles.isEmpty() : "Should have produced an empty file to preserve metadata."; return newFiles; } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCleanupCompactedFileAfterFailover.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCleanupCompactedFileAfterFailover.java new file mode 100644 index 0000000..3b2e89f --- /dev/null +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCleanupCompactedFileAfterFailover.java @@ -0,0 +1,165 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.regionserver; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.hadoop.hbase.HBaseClassTestRule; +import org.apache.hadoop.hbase.HBaseTestingUtility; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; +import org.apache.hadoop.hbase.client.Put; +import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.client.TableDescriptorBuilder; +import org.apache.hadoop.hbase.master.cleaner.TimeToLiveHFileCleaner; +import org.apache.hadoop.hbase.regionserver.compactions.CompactionConfiguration; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.util.JVMClusterUtil; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@Category({LargeTests.class}) +public class TestCleanupCompactedFileAfterFailover { + + private static final Logger LOG = + LoggerFactory.getLogger(TestCleanupCompactedFileAfterFailover.class); + + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestCleanupCompactedFileAfterFailover.class); + + private static HBaseTestingUtility TEST_UTIL; + private static Admin admin; + private static Table table; + + private static TableName TABLE_NAME = TableName.valueOf("TestCleanupCompactedFileAfterFailover"); + private static byte[] ROW = Bytes.toBytes("row"); + private static byte[] FAMILY = Bytes.toBytes("cf"); + private static byte[] QUALIFIER = Bytes.toBytes("cq"); + private static byte[] VALUE = Bytes.toBytes("value"); + private static final int RS_NUMBER = 2; + + @BeforeClass + public static void beforeClass() throws Exception { + TEST_UTIL = new HBaseTestingUtility(); + // Set the scanner lease to 20min, so the scanner can't be closed by RegionServer + TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD, 1200000); + TEST_UTIL.getConfiguration() + .setInt(CompactionConfiguration.HBASE_HSTORE_COMPACTION_MIN_KEY, 100); + TEST_UTIL.getConfiguration().set("dfs.blocksize", "64000"); + TEST_UTIL.getConfiguration().set("dfs.namenode.fs-limits.min-block-size", "1024"); + TEST_UTIL.getConfiguration().set(TimeToLiveHFileCleaner.TTL_CONF_KEY, "0"); + TEST_UTIL.startMiniCluster(RS_NUMBER); + + admin = TEST_UTIL.getAdmin(); + TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(TABLE_NAME); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)); + admin.createTable(builder.build()); + TEST_UTIL.waitTableAvailable(TABLE_NAME); + table = TEST_UTIL.getConnection().getTable(TABLE_NAME); + } + + @AfterClass + public static void afterclass() throws Exception { + admin.disableTable(TABLE_NAME); + admin.deleteTable(TABLE_NAME); + TEST_UTIL.shutdownMiniCluster(); + } + + @Test + public void testCleanupAfterFailover() throws Exception { + HRegionServer rsServedTable = null; + List regions = new ArrayList<>(); + for (JVMClusterUtil.RegionServerThread rsThread : TEST_UTIL.getHBaseCluster() + .getRegionServerThreads()) { + HRegionServer rs = rsThread.getRegionServer(); + if (rs.getOnlineTables().contains(TABLE_NAME)) { + regions.addAll(rs.getRegions(TABLE_NAME)); + rsServedTable = rs; + } + } + assertNotNull(rsServedTable); + assertEquals("Table should only have one region", 1, regions.size()); + HRegion region = regions.get(0); + HStore store = region.getStore(FAMILY); + + writeDataAndFlush(3, region); + assertEquals(3, store.getStorefilesCount()); + + // Open a scanner and not close, then the storefile will be referenced + table.getScanner(new Scan()); + + region.compact(true); + assertEquals(1, store.getStorefilesCount()); + // The compacted file should not be archived as there are references by user scanner + assertEquals(3, store.getStoreEngine().getStoreFileManager().getCompactedfiles().size()); + + int walNum = rsServedTable.getWALs().size(); + // Roll WAL + rsServedTable.walRoller.requestRollAll(); + // Flush again + region.flush(true); + // The WAL which contains compaction event marker should be archived + assertEquals("The old WAL should be archived", walNum, rsServedTable.getWALs().size()); + + rsServedTable.kill(); + // Sleep to wait failover + Thread.sleep(3000); + TEST_UTIL.waitTableAvailable(TABLE_NAME); + + regions.clear(); + for (JVMClusterUtil.RegionServerThread rsThread : TEST_UTIL.getHBaseCluster() + .getRegionServerThreads()) { + HRegionServer rs = rsThread.getRegionServer(); + if (rs != rsServedTable && rs.getOnlineTables().contains(TABLE_NAME)) { + regions.addAll(rs.getRegions(TABLE_NAME)); + } + } + assertEquals("Table should only have one region", 1, regions.size()); + region = regions.get(0); + store = region.getStore(FAMILY); + // The compacted storefile should be cleaned and only have 1 storefile + assertEquals(1, store.getStorefilesCount()); + } + + private void writeDataAndFlush(int fileNum, HRegion region) throws Exception { + for (int i = 0; i < fileNum; i++) { + for (int j = 0; j < 100; j++) { + table.put(new Put(concat(ROW, j)).addColumn(FAMILY, QUALIFIER, concat(VALUE, j))); + } + region.flush(true); + } + } + + private byte[] concat(byte[] base, int index) { + return Bytes.toBytes(Bytes.toString(base) + "-" + index); + } +} diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCleanupCompactedFileOnRegionClose.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCleanupCompactedFileOnRegionClose.java index 564e5c7..6ae68f8 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCleanupCompactedFileOnRegionClose.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCleanupCompactedFileOnRegionClose.java @@ -22,19 +22,15 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import java.io.IOException; import java.util.Collection; import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HBaseAdmin; -import org.apache.hadoop.hbase.client.IsolationLevel; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; @@ -151,60 +147,4 @@ public class TestCleanupCompactedFileOnRegionClose { ((HStore)region.getStore(familyNameBytes)).getStoreEngine().getStoreFileManager() .getCompactedfiles().size()); } - - @Test - public void testIOExceptionThrownOnClose() throws Exception { - byte[] filler = new byte[128000]; - TableName tableName = TableName.valueOf("testIOExceptionThrownOnClose"); - String familyName = "f"; - byte[] familyNameBytes = Bytes.toBytes(familyName); - util.createTable(tableName, familyName); - - Table table = util.getConnection().getTable(tableName); - - HRegionServer rs = util.getRSForFirstRegionInTable(tableName); - Region region = rs.getRegions(tableName).get(0); - - int refSFCount = 4; - for (int i = 0; i < refSFCount; i++) { - for (int j = 0; j < refSFCount; j++) { - Put put = new Put(Bytes.toBytes(j)); - put.addColumn(familyNameBytes, Bytes.toBytes(i), filler); - table.put(put); - } - util.flush(tableName); - } - assertEquals(refSFCount, region.getStoreFileList(new byte[][]{familyNameBytes}).size()); - - HStore store = ((HRegion) region).getStore(familyNameBytes); - HStoreFile hsf = ((Collection)region.getStore(familyNameBytes).getStorefiles()) - .iterator().next(); - long readPt = ((HRegion)region).getReadPoint(IsolationLevel.READ_COMMITTED); - StoreFileScanner preadScanner = hsf.getPreadScanner(false, readPt, 0, false); - StoreFileScanner streamScanner = - hsf.getStreamScanner(false, false, false, readPt, 0, false); - preadScanner.seek(KeyValue.LOWESTKEY); - streamScanner.seek(KeyValue.LOWESTKEY); - - //Major compact to produce compacted storefiles that need to be cleaned up - util.compact(tableName, true); - assertNotNull(preadScanner.next()); - assertNotNull(streamScanner.next()); - store.closeAndArchiveCompactedFiles(true); - - try { - assertNotNull(preadScanner.next()); - fail("Expected IOException"); - }catch (IOException ex) { - ex.printStackTrace(); - } - - //Wait a bit for file to be remove from - try { - assertNotNull(streamScanner.next()); - fail("Expected IOException"); - } catch (IOException ex) { - ex.printStackTrace(); - } - } } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSwitchToStreamRead.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSwitchToStreamRead.java index c1cecf8..f0372f6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSwitchToStreamRead.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSwitchToStreamRead.java @@ -23,12 +23,8 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; import java.util.List; -import java.util.Set; import java.util.concurrent.ThreadLocalRandom; -import java.util.stream.Collectors; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HBaseClassTestRule; @@ -38,7 +34,6 @@ import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Scan; -import org.apache.hadoop.hbase.client.Scan.ReadType; import org.apache.hadoop.hbase.client.TableDescriptorBuilder; import org.apache.hadoop.hbase.filter.Filter; import org.apache.hadoop.hbase.filter.FilterBase; @@ -48,7 +43,6 @@ import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; -import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; import org.junit.Ignore; @@ -105,49 +99,6 @@ public class TestSwitchToStreamRead { UTIL.cleanupTestDir(); } - private Set getStreamReaders() { - List stores = REGION.getStores(); - Assert.assertEquals(1, stores.size()); - HStore firstStore = stores.get(0); - Assert.assertNotNull(firstStore); - Collection storeFiles = firstStore.getStorefiles(); - Assert.assertEquals(1, storeFiles.size()); - HStoreFile firstSToreFile = storeFiles.iterator().next(); - Assert.assertNotNull(firstSToreFile); - return Collections.unmodifiableSet(firstSToreFile.streamReaders); - } - - /** - * Test Case for HBASE-21551 - */ - @Test - public void testStreamReadersCleanup() throws IOException { - Set streamReaders = getStreamReaders(); - Assert.assertEquals(0, getStreamReaders().size()); - try (RegionScannerImpl scanner = REGION.getScanner(new Scan().setReadType(ReadType.STREAM))) { - StoreScanner storeScanner = - (StoreScanner) (scanner).getStoreHeapForTesting().getCurrentForTesting(); - List sfScanners = storeScanner.getAllScannersForTesting().stream() - .filter(kvs -> kvs instanceof StoreFileScanner).map(kvs -> (StoreFileScanner) kvs) - .collect(Collectors.toList()); - Assert.assertEquals(1, sfScanners.size()); - StoreFileScanner sfScanner = sfScanners.get(0); - Assert.assertFalse(sfScanner.getReader().shared); - - // There should be a stream reader - Assert.assertEquals(1, getStreamReaders().size()); - } - Assert.assertEquals(0, getStreamReaders().size()); - - // The streamsReader should be clear after region close even if there're some opened stream - // scanner. - RegionScannerImpl scanner = REGION.getScanner(new Scan().setReadType(ReadType.STREAM)); - Assert.assertNotNull(scanner); - Assert.assertEquals(1, getStreamReaders().size()); - REGION.close(); - Assert.assertEquals(0, streamReaders.size()); - } - @Test public void test() throws IOException { try (RegionScannerImpl scanner = REGION.getScanner(new Scan())) { diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCompactor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCompactor.java index f8df870..2dbf00c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCompactor.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCompactor.java @@ -25,6 +25,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.anyCollection; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyLong; @@ -111,6 +112,13 @@ public class TestCompactor { return null; } }).when(writer).appendMetadata(anyLong(), anyBoolean()); + doAnswer(new Answer() { + @Override + public Void answer(InvocationOnMock invocation) throws Throwable { + realWriter.hasMetadata = true; + return null; + } + }).when(writer).appendMetadata(anyLong(), anyBoolean(), anyCollection()); doAnswer(new Answer() { @Override public Path answer(InvocationOnMock invocation) throws Throwable { -- 2.7.4