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

HBASE-15999 NPE in MemstoreCompactor (Ram)

This commit is contained in:
Ramkrishna 2016-06-16 10:06:40 +05:30
parent 158568e780
commit f19f1d9e99
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactingMemStore.java
View File

@ -253,10 +253,11 @@ public class CompactingMemStore extends AbstractMemStore {
* in exclusive mode while this method (checkActiveSize) is invoked holding updatesLock
* in the shared mode. */
InMemoryFlushRunnable runnable = new InMemoryFlushRunnable();
LOG.info("Dispatching the MemStore in-memory flush for store " + store.getColumnFamilyName());
if (LOG.isTraceEnabled()) {
LOG.trace(
"Dispatching the MemStore in-memory flush for store " + store.getColumnFamilyName());
}
getPool().execute(runnable);
// guard against queuing same old compactions over and over again
inMemoryFlushInProgress.set(true);
}
}
@ -277,10 +278,9 @@ public class CompactingMemStore extends AbstractMemStore {
}
// Phase II: Compact the pipeline
try {
if (allowCompaction.get()) {
if (allowCompaction.get() && inMemoryFlushInProgress.compareAndSet(false, true)) {
// setting the inMemoryFlushInProgress flag again for the case this method is invoked
// directly (only in tests) in the common path setting from true to true is idempotent
inMemoryFlushInProgress.set(true);
// Speculative compaction execution, may be interrupted if flush is forced while
// compaction is in progress
compactor.startCompaction();