HBASE-23359 RS going down with NPE when splitting a region with compa…

…ction disabled in branch-1 (#899) Signed-off-by: Balazs Meszaros <[email protected]> Signed-off-by Anoop Sam John <[email protected]>
apache · Dec 8, 2019 · c612a2e · c612a2e
1 parent 75e044f
commit c612a2e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
@@ -608,7 +608,9 @@ public void rejectedExecution(Runnable runnable, ThreadPoolExecutor pool) {
       if (runnable instanceof CompactionRunner) {
         CompactionRunner runner = (CompactionRunner)runnable;
         LOG.debug("Compaction Rejected: " + runner);
-        runner.store.cancelRequestedCompaction(runner.compaction);
+        if (runner.compaction != null) {
+          runner.store.cancelRequestedCompaction(runner.compaction);
+        }
       }
     }
   }