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

Revert "HBASE-12454 Setting didPerformCompaction early in HRegion#compact" 

This reverts commit b0a434a5ce.
This commit is contained in:
Andrew Purtell 2014-11-12 12:30:57 -08:00
parent 05c1663392
commit 210f5a3b01
3 changed files with 2 additions and 7 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

@ -1565,8 +1565,8 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver { //
doRegionCompactionPrep(); doRegionCompactionPrep();
try { try {
status.setStatus("Compacting store " + store); status.setStatus("Compacting store " + store);
store.compact(compaction);
didPerformCompaction = true; didPerformCompaction = true;
store.compact(compaction);
} 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,9 +1544,7 @@ public class HStore implements Store {
@Override @Override
public void cancelRequestedCompaction(CompactionContext compaction) { public void cancelRequestedCompaction(CompactionContext compaction) {
if (compaction != null) { finishCompactionRequest(compaction.getRequest());
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

@ -161,9 +161,6 @@ 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,