This is an automated email from the ASF dual-hosted git repository.
zghao pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.2 by this push:
new 863e268 HBASE-22163 Should not archive the compacted store files when
region warmup
863e268 is described below
commit 863e2685587096fb1db54f26e1b0315dbebdb4d7
Author: Guanghao <zghao...@gmail.com>
AuthorDate: Mon Apr 8 22:11:07 2019 +0800
HBASE-22163 Should not archive the compacted store files when region warmup
---
.../example/TestRefreshHFilesEndpoint.java | 6 +-
.../hadoop/hbase/regionserver/CompactionTool.java | 2 +-
.../org/apache/hadoop/hbase/master/HMaster.java | 7 +-
.../hbase/master/assignment/AssignmentManager.java | 2 +-
.../hadoop/hbase/regionserver/HMobStore.java | 4 +-
.../apache/hadoop/hbase/regionserver/HRegion.java | 23 ++--
.../apache/hadoop/hbase/regionserver/HStore.java | 40 +++---
.../hadoop/hbase/regionserver/RSRpcServices.java | 5 +-
.../org/apache/hadoop/hbase/TestIOFencing.java | 10 +-
.../client/TestFromClientSideScanExcpetion.java | 11 +-
.../regionserver/TestCacheOnWriteInSchema.java | 2 +-
.../hbase/regionserver/TestCompactingMemStore.java | 2 +-
.../hbase/regionserver/TestCompactionPolicy.java | 2 +-
.../hadoop/hbase/regionserver/TestHMobStore.java | 2 +-
.../hadoop/hbase/regionserver/TestHRegion.java | 18 +--
.../hadoop/hbase/regionserver/TestHStore.java | 9 +-
...estNotCleanupCompactedFileWhenRegionWarmup.java | 149 +++++++++++++++++++++
17 files changed, 228 insertions(+), 66 deletions(-)
diff --git
a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRefreshHFilesEndpoint.java
b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRefreshHFilesEndpoint.java
index 1a7c990..3f9c23b 100644
---
a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRefreshHFilesEndpoint.java
+++
b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRefreshHFilesEndpoint.java
@@ -109,9 +109,9 @@ public class TestRefreshHFilesEndpoint extends
TestRefreshHFilesBase {
}
public static class HStoreWithFaultyRefreshHFilesAPI extends HStore {
- public HStoreWithFaultyRefreshHFilesAPI(final HRegion region, final
ColumnFamilyDescriptor family,
- final Configuration confParam)
throws IOException {
- super(region, family, confParam);
+ public HStoreWithFaultyRefreshHFilesAPI(final HRegion region,
+ final ColumnFamilyDescriptor family, final Configuration confParam)
throws IOException {
+ super(region, family, confParam, false);
}
@Override
diff --git
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/regionserver/CompactionTool.java
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/regionserver/CompactionTool.java
index 18a5987..da06fff 100644
---
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/regionserver/CompactionTool.java
+++
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/regionserver/CompactionTool.java
@@ -191,7 +191,7 @@ public class CompactionTool extends Configured implements
Tool {
}
};
HRegion region = new HRegion(regionFs, null, conf, htd, null);
- return new HStore(region,
htd.getColumnFamily(Bytes.toBytes(familyName)), conf);
+ return new HStore(region,
htd.getColumnFamily(Bytes.toBytes(familyName)), conf, false);
}
}
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 962247d..070a47a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -134,6 +134,7 @@ import
org.apache.hadoop.hbase.master.procedure.MasterProcedureScheduler;
import org.apache.hadoop.hbase.master.procedure.MasterProcedureUtil;
import org.apache.hadoop.hbase.master.procedure.ModifyTableProcedure;
import org.apache.hadoop.hbase.master.procedure.ProcedurePrepareLatch;
+import org.apache.hadoop.hbase.master.procedure.ProcedureSyncWait;
import org.apache.hadoop.hbase.master.procedure.RecoverMetaProcedure;
import org.apache.hadoop.hbase.master.procedure.ServerCrashProcedure;
import org.apache.hadoop.hbase.master.procedure.TruncateTableProcedure;
@@ -2002,13 +2003,15 @@ public class HMaster extends HRegionServer implements
MasterServices {
if (this.cpHost != null) {
this.cpHost.preMove(hri, rp.getSource(), rp.getDestination());
}
+
+ TransitRegionStateProcedure proc =
+ this.assignmentManager.createMoveRegionProcedure(rp.getRegionInfo(),
rp.getDestination());
// Warmup the region on the destination before initiating the move. this
call
// is synchronous and takes some time. doing it before the source region
gets
// closed
serverManager.sendRegionWarmup(rp.getDestination(), hri);
-
LOG.info(getClientIdAuditPrefix() + " move " + rp + ", running
balancer");
- Future<byte []> future = this.assignmentManager.moveAsync(rp);
+ Future<byte[]> future =
ProcedureSyncWait.submitProcedure(this.procedureExecutor, proc);
try {
// Is this going to work? Will we throw exception on error?
// TODO: CompletableFuture rather than this stunted Future.
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
index 5e43637..1aea8f9 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
@@ -592,7 +592,7 @@ public class AssignmentManager {
return proc.getProcId();
}
- private TransitRegionStateProcedure createMoveRegionProcedure(RegionInfo
regionInfo,
+ public TransitRegionStateProcedure createMoveRegionProcedure(RegionInfo
regionInfo,
ServerName targetServer) throws HBaseIOException {
RegionStateNode regionNode =
this.regionStates.getRegionStateNode(regionInfo);
if (regionNode == null) {
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HMobStore.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HMobStore.java
index b657183..632642f 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HMobStore.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HMobStore.java
@@ -104,8 +104,8 @@ public class HMobStore extends HStore {
private final byte[] refCellTags;
public HMobStore(final HRegion region, final ColumnFamilyDescriptor family,
- final Configuration confParam) throws IOException {
- super(region, family, confParam);
+ final Configuration confParam, boolean warmup) throws IOException {
+ super(region, family, confParam, warmup);
this.family = family;
this.mobFileCache = region.getMobFileCache();
this.homePath = MobUtils.getMobHome(conf);
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index a4d3dff..10e5ba8 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -1045,6 +1045,11 @@ public class HRegion implements HeapSize,
PropagatingConfigurationObserver, Regi
*/
private long initializeStores(CancelableProgressable reporter, MonitoredTask
status)
throws IOException {
+ return initializeStores(reporter, status, false);
+ }
+
+ private long initializeStores(CancelableProgressable reporter, MonitoredTask
status,
+ boolean warmup) throws IOException {
// Load in all the HStores.
long maxSeqId = -1;
// initialized to -1 so that we pick up MemstoreTS from column families
@@ -1062,7 +1067,7 @@ public class HRegion implements HeapSize,
PropagatingConfigurationObserver, Regi
completionService.submit(new Callable<HStore>() {
@Override
public HStore call() throws IOException {
- return instantiateHStore(family);
+ return instantiateHStore(family, warmup);
}
});
}
@@ -1122,7 +1127,7 @@ public class HRegion implements HeapSize,
PropagatingConfigurationObserver, Regi
// Initialize all the HStores
status.setStatus("Warming up all the Stores");
try {
- initializeStores(reporter, status);
+ initializeStores(reporter, status, true);
} finally {
status.markComplete("Done warming up.");
}
@@ -5760,17 +5765,17 @@ public class HRegion implements HeapSize,
PropagatingConfigurationObserver, Regi
return true;
}
- protected HStore instantiateHStore(final ColumnFamilyDescriptor family)
throws IOException {
+ protected HStore instantiateHStore(final ColumnFamilyDescriptor family,
boolean warmup)
+ throws IOException {
if (family.isMobEnabled()) {
if (HFile.getFormatVersion(this.conf) <
HFile.MIN_FORMAT_VERSION_WITH_TAGS) {
- throw new IOException("A minimum HFile version of "
- + HFile.MIN_FORMAT_VERSION_WITH_TAGS
- + " is required for MOB feature. Consider setting " +
HFile.FORMAT_VERSION_KEY
- + " accordingly.");
+ throw new IOException("A minimum HFile version of " +
HFile.MIN_FORMAT_VERSION_WITH_TAGS +
+ " is required for MOB feature. Consider setting " +
HFile.FORMAT_VERSION_KEY +
+ " accordingly.");
}
- return new HMobStore(this, family, this.conf);
+ return new HMobStore(this, family, this.conf, warmup);
}
- return new HStore(this, family, this.conf);
+ return new HStore(this, family, this.conf, warmup);
}
@Override
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 72b10bd..0faeaa1 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
@@ -238,7 +238,7 @@ public class HStore implements Store, HeapSize,
StoreConfigInformation, Propagat
* @throws IOException
*/
protected HStore(final HRegion region, final ColumnFamilyDescriptor family,
- final Configuration confParam) throws IOException {
+ final Configuration confParam, boolean warmup) throws IOException {
this.fs = region.getRegionFileSystem();
@@ -300,7 +300,7 @@ public class HStore implements Store, HeapSize,
StoreConfigInformation, Propagat
}
this.storeEngine = createStoreEngine(this, this.conf, this.comparator);
- List<HStoreFile> hStoreFiles = loadStoreFiles();
+ List<HStoreFile> hStoreFiles = loadStoreFiles(warmup);
// Move the storeSize calculation out of loadStoreFiles() method, because
the secondary read
// replica's refreshStoreFiles() will also use loadStoreFiles() to refresh
its store files and
// update the storeSize in the completeCompaction(..) finally (just like
compaction) , so
@@ -552,12 +552,13 @@ public class HStore implements Store, HeapSize,
StoreConfigInformation, Propagat
* from the given directory.
* @throws IOException
*/
- private List<HStoreFile> loadStoreFiles() throws IOException {
+ private List<HStoreFile> loadStoreFiles(boolean warmup) throws IOException {
Collection<StoreFileInfo> files = fs.getStoreFiles(getColumnFamilyName());
- return openStoreFiles(files);
+ return openStoreFiles(files, warmup);
}
- private List<HStoreFile> openStoreFiles(Collection<StoreFileInfo> files)
throws IOException {
+ private List<HStoreFile> openStoreFiles(Collection<StoreFileInfo> files,
boolean warmup)
+ throws IOException {
if (CollectionUtils.isEmpty(files)) {
return Collections.emptyList();
}
@@ -611,19 +612,22 @@ public class HStore implements Store, HeapSize,
StoreConfigInformation, Propagat
throw ioe;
}
- // Remove the compacted files from result
- List<HStoreFile> 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);
+ // Should not archive the compacted store files when region warmup. See
HBASE-22163.
+ if (!warmup) {
+ // Remove the compacted files from result
+ List<HStoreFile> 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);
}
- }
- 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;
@@ -691,7 +695,7 @@ public class HStore implements Store, HeapSize,
StoreConfigInformation, Propagat
}
// try to open the files
- List<HStoreFile> openedFiles = openStoreFiles(toBeAddedFiles);
+ List<HStoreFile> openedFiles = openStoreFiles(toBeAddedFiles, false);
// propogate the file changes to the underlying store file manager
replaceStoreFiles(toBeRemovedStoreFiles, openedFiles); //won't throw an
exception
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
index a69307d..2c749d7 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
@@ -2139,10 +2139,6 @@ public class RSRpcServices implements
HBaseRPCErrorHandler,
return response;
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Warming up Region " + region.getRegionNameAsString());
- }
-
htd = regionServer.tableDescriptors.get(region.getTable());
if
(regionServer.getRegionsInTransitionInRS().containsKey(encodedNameBytes)) {
@@ -2150,6 +2146,7 @@ public class RSRpcServices implements
HBaseRPCErrorHandler,
return response;
}
+ LOG.info("Warming up region " + region.getRegionNameAsString());
HRegion.warmupHRegion(region, htd, regionServer.getWAL(region),
regionServer.getConfiguration(), regionServer, null);
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java
index 2df484a..063d023 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java
@@ -194,17 +194,19 @@ public class TestIOFencing {
TableDescriptor htd, RegionServerServices rsServices) {
super(tableDir, log, fs, confParam, info, htd, rsServices);
}
+
@Override
- protected HStore instantiateHStore(final ColumnFamilyDescriptor family)
throws IOException {
- return new BlockCompactionsInCompletionHStore(this, family, this.conf);
+ protected HStore instantiateHStore(final ColumnFamilyDescriptor family,
boolean warmup)
+ throws IOException {
+ return new BlockCompactionsInCompletionHStore(this, family, this.conf,
warmup);
}
}
public static class BlockCompactionsInCompletionHStore extends HStore {
CompactionBlockerRegion r;
protected BlockCompactionsInCompletionHStore(HRegion region,
ColumnFamilyDescriptor family,
- Configuration confParam) throws IOException {
- super(region, family, confParam);
+ Configuration confParam, boolean warmup) throws IOException {
+ super(region, family, confParam, warmup);
r = (CompactionBlockerRegion) region;
}
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideScanExcpetion.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideScanExcpetion.java
index 34481ba..3fb482d 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideScanExcpetion.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideScanExcpetion.java
@@ -116,16 +116,17 @@ public class TestFromClientSideScanExcpetion {
}
@Override
- protected HStore instantiateHStore(ColumnFamilyDescriptor family) throws
IOException {
- return new MyHStore(this, family, conf);
+ protected HStore instantiateHStore(ColumnFamilyDescriptor family, boolean
warmup)
+ throws IOException {
+ return new MyHStore(this, family, conf, warmup);
}
}
public static final class MyHStore extends HStore {
- public MyHStore(HRegion region, ColumnFamilyDescriptor family,
Configuration confParam)
- throws IOException {
- super(region, family, confParam);
+ public MyHStore(HRegion region, ColumnFamilyDescriptor family,
Configuration confParam,
+ boolean warmup) throws IOException {
+ super(region, family, confParam, warmup);
}
@Override
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.java
index 1248b21..5bb103c 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.java
@@ -182,7 +182,7 @@ public class TestCacheOnWriteInSchema {
region = TEST_UTIL.createLocalHRegion(info, htd, walFactory.getWAL(info));
region.setBlockCache(BlockCacheFactory.createBlockCache(conf));
- store = new HStore(region, hcd, conf);
+ store = new HStore(region, hcd, conf, false);
}
@After
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactingMemStore.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactingMemStore.java
index 501d5cd..e5a2a8a 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactingMemStore.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactingMemStore.java
@@ -118,7 +118,7 @@ public class TestCompactingMemStore extends
TestDefaultMemStore {
this.regionServicesForStores =
Mockito.spy(region.getRegionServicesForStores());
ThreadPoolExecutor pool = (ThreadPoolExecutor)
Executors.newFixedThreadPool(1);
Mockito.when(regionServicesForStores.getInMemoryCompactionPool()).thenReturn(pool);
- this.store = new HStore(region, hcd, conf);
+ this.store = new HStore(region, hcd, conf, false);
long globalMemStoreLimit = (long)
(ManagementFactory.getMemoryMXBean().getHeapMemoryUsage()
.getMax() * MemorySizeUtil.getGlobalMemStoreHeapPercent(conf, false));
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionPolicy.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionPolicy.java
index ca4b227..d48e1e1 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionPolicy.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionPolicy.java
@@ -106,7 +106,7 @@ public class TestCompactionPolicy {
Path tableDir = FSUtils.getTableDir(basedir, htd.getTableName());
region = new HRegion(tableDir, hlog, fs, conf, info, htd, null);
- store = new HStore(region, hcd, conf);
+ store = new HStore(region, hcd, conf, false);
TEST_FILE = region.getRegionFileSystem().createTempName();
fs.createNewFile(TEST_FILE);
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHMobStore.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHMobStore.java
index 2001602..bf1f18e 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHMobStore.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHMobStore.java
@@ -166,7 +166,7 @@ public class TestHMobStore {
final WALFactory wals = new WALFactory(walConf, methodName);
region = new HRegion(tableDir, wals.getWAL(info), fs, conf, info, td,
null);
region.setMobFileCache(new MobFileCache(conf));
- store = new HMobStore(region, cfd, conf);
+ store = new HMobStore(region, cfd, conf, false);
if (testStore) {
init(conf, cfd);
}
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
index a61ae6c..c09f702 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
@@ -6302,17 +6302,17 @@ public class TestHRegion {
* @return If Mob is enabled, return HMobStore, otherwise return
HStoreForTesting.
*/
@Override
- protected HStore instantiateHStore(final ColumnFamilyDescriptor family)
throws IOException {
+ protected HStore instantiateHStore(final ColumnFamilyDescriptor family,
boolean warmup)
+ throws IOException {
if (family.isMobEnabled()) {
if (HFile.getFormatVersion(this.conf) <
HFile.MIN_FORMAT_VERSION_WITH_TAGS) {
- throw new IOException("A minimum HFile version of "
- + HFile.MIN_FORMAT_VERSION_WITH_TAGS
- + " is required for MOB feature. Consider setting " +
HFile.FORMAT_VERSION_KEY
- + " accordingly.");
+ throw new IOException("A minimum HFile version of " +
HFile.MIN_FORMAT_VERSION_WITH_TAGS +
+ " is required for MOB feature. Consider setting " +
HFile.FORMAT_VERSION_KEY +
+ " accordingly.");
}
- return new HMobStore(this, family, this.conf);
+ return new HMobStore(this, family, this.conf, warmup);
}
- return new HStoreForTesting(this, family, this.conf);
+ return new HStoreForTesting(this, family, this.conf, warmup);
}
}
@@ -6328,8 +6328,8 @@ public class TestHRegion {
protected HStoreForTesting(final HRegion region,
final ColumnFamilyDescriptor family,
- final Configuration confParam) throws IOException {
- super(region, family, confParam);
+ final Configuration confParam, boolean warmup) throws IOException {
+ super(region, family, confParam, warmup);
}
@Override
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
index de799e4..d44c36e 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStore.java
@@ -229,7 +229,7 @@ public class TestHStore {
ColumnFamilyDescriptor hcd, MyStoreHook hook, boolean switchToPread)
throws IOException {
initHRegion(methodName, conf, builder, hcd, hook, switchToPread);
if (hook == null) {
- store = new HStore(region, hcd, conf);
+ store = new HStore(region, hcd, conf, false);
} else {
store = new MyStore(region, hcd, conf, hook, switchToPread);
}
@@ -494,7 +494,8 @@ public class TestHStore {
w.close();
this.store.close();
// Reopen it... should pick up two files
- this.store = new HStore(this.store.getHRegion(),
this.store.getColumnFamilyDescriptor(), c);
+ this.store =
+ new HStore(this.store.getHRegion(),
this.store.getColumnFamilyDescriptor(), c, false);
assertEquals(2, this.store.getStorefilesCount());
result = HBaseTestingUtility.getFromStoreFile(store,
@@ -1524,7 +1525,7 @@ public class TestHStore {
ColumnFamilyDescriptor hcd = ColumnFamilyDescriptorBuilder.of(family);
initHRegion(name.getMethodName(), conf,
TableDescriptorBuilder.newBuilder(TableName.valueOf(table)), hcd, null,
false);
- HStore store = new HStore(region, hcd, conf) {
+ HStore store = new HStore(region, hcd, conf, false) {
@Override
protected StoreEngine<?, ?, ?, ?> createStoreEngine(HStore store,
Configuration conf,
@@ -1566,7 +1567,7 @@ public class TestHStore {
MyStore(final HRegion region, final ColumnFamilyDescriptor family, final
Configuration
confParam, MyStoreHook hook, boolean switchToPread) throws IOException
{
- super(region, family, confParam);
+ super(region, family, confParam, false);
this.hook = hook;
}
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestNotCleanupCompactedFileWhenRegionWarmup.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestNotCleanupCompactedFileWhenRegionWarmup.java
new file mode 100644
index 0000000..8070f1d
--- /dev/null
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestNotCleanupCompactedFileWhenRegionWarmup.java
@@ -0,0 +1,149 @@
+/**
+ * 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 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.testclassification.RegionServerTests;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.JVMClusterUtil;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+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;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+@Category({ LargeTests.class, RegionServerTests.class })
+public class TestNotCleanupCompactedFileWhenRegionWarmup {
+ private static final Logger LOG =
+
LoggerFactory.getLogger(TestNotCleanupCompactedFileWhenRegionWarmup.class);
+
+ @ClassRule
+ public static final HBaseClassTestRule CLASS_RULE =
+
HBaseClassTestRule.forClass(TestNotCleanupCompactedFileWhenRegionWarmup.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");
+
+ @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(1);
+ admin = TEST_UTIL.getAdmin();
+ }
+
+ @AfterClass
+ public static void afterClass() throws Exception {
+ TEST_UTIL.shutdownMiniCluster();
+ }
+
+ @Before
+ public void before() throws Exception {
+ 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);
+ }
+
+ @After
+ public void after() throws Exception {
+ admin.disableTable(TABLE_NAME);
+ admin.deleteTable(TABLE_NAME);
+ }
+
+ @Test
+ public void testRegionWarmup() throws Exception {
+ List<HRegion> regions = new ArrayList<>();
+ for (JVMClusterUtil.RegionServerThread rsThread :
TEST_UTIL.getHBaseCluster()
+ .getLiveRegionServerThreads()) {
+ HRegionServer rs = rsThread.getRegionServer();
+ if (rs.getOnlineTables().contains(TABLE_NAME)) {
+ regions.addAll(rs.getRegions(TABLE_NAME));
+ }
+ }
+ 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
+ store.getScanner(new Scan(), null, 0);
+ 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());
+
+ HStore newStore =
region.instantiateHStore(ColumnFamilyDescriptorBuilder.of(FAMILY), true);
+ // Should not archive the compacted storefiles when region warmup
+ assertEquals(4, newStore.getStorefilesCount());
+
+ newStore =
region.instantiateHStore(ColumnFamilyDescriptorBuilder.of(FAMILY), false);
+ // Archived the compacted storefiles when region real open
+ assertEquals(1, newStore.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);
+ }
+}
