Revert "HBASE-12454 Setting didPerformCompaction early in HRegion#compact"
This reverts commit b0a434a5ce
.
This commit is contained in:
parent
05c1663392
commit
210f5a3b01
|
@ -1565,8 +1565,8 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver { //
|
|||
doRegionCompactionPrep();
|
||||
try {
|
||||
status.setStatus("Compacting store " + store);
|
||||
store.compact(compaction);
|
||||
didPerformCompaction = true;
|
||||
store.compact(compaction);
|
||||
} catch (InterruptedIOException iioe) {
|
||||
String msg = "compaction interrupted";
|
||||
LOG.info(msg, iioe);
|
||||
|
|
|
@ -1544,9 +1544,7 @@ public class HStore implements Store {
|
|||
|
||||
@Override
|
||||
public void cancelRequestedCompaction(CompactionContext compaction) {
|
||||
if (compaction != null) {
|
||||
finishCompactionRequest(compaction.getRequest());
|
||||
}
|
||||
finishCompactionRequest(compaction.getRequest());
|
||||
}
|
||||
|
||||
private void finishCompactionRequest(CompactionRequest cr) {
|
||||
|
|
|
@ -161,9 +161,6 @@ public class TestCompaction {
|
|||
}).when(spyR).doRegionCompactionPrep();
|
||||
|
||||
// force a minor compaction, but not before requesting a stop
|
||||
|
||||
// Accounting: Normally compaction requests go through HStore#requestCompaction
|
||||
r.reportCompactionRequestStart(false);
|
||||
spyR.compactStores();
|
||||
|
||||
// ensure that the compaction stopped, all old files are intact,
|
||||
|
|
Loading…
Reference in New Issue