Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-12454 Setting didPerformCompaction early in HRegion#compact

This commit is contained in:
Andrew Purtell 2014-11-12 09:29:46 -08:00
parent f3a38dcf16
commit 16decdc19a
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
View File

@ -1566,8 +1566,8 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver { //
doRegionCompactionPrep(); doRegionCompactionPrep();
try { try {
status.setStatus("Compacting store " + store); status.setStatus("Compacting store " + store);
didPerformCompaction = true;
store.compact(compaction); store.compact(compaction);
didPerformCompaction = true;
} catch (InterruptedIOException iioe) { } catch (InterruptedIOException iioe) {
String msg = "compaction interrupted"; String msg = "compaction interrupted";
LOG.info(msg, iioe); LOG.info(msg, iioe);

4
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
View File

@ -1544,7 +1544,9 @@ public class HStore implements Store {
@Override @Override
public void cancelRequestedCompaction(CompactionContext compaction) { public void cancelRequestedCompaction(CompactionContext compaction) {
finishCompactionRequest(compaction.getRequest()); if (compaction != null) {
finishCompactionRequest(compaction.getRequest());
}
} }
private void finishCompactionRequest(CompactionRequest cr) { private void finishCompactionRequest(CompactionRequest cr) {

3
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java
View File

@ -160,6 +160,9 @@ public class TestCompaction {
}).when(spyR).doRegionCompactionPrep(); }).when(spyR).doRegionCompactionPrep();
// force a minor compaction, but not before requesting a stop // force a minor compaction, but not before requesting a stop
// Accounting: Normally compaction requests go through HStore#requestCompaction
r.reportCompactionRequestStart(false);
spyR.compactStores(); spyR.compactStores();
// ensure that the compaction stopped, all old files are intact, // ensure that the compaction stopped, all old files are intact,