From 8ef01d0471ff4fc083f71e4e7d70147866727250 Mon Sep 17 00:00:00 2001 From: Toshihiro Suzuki Date: Wed, 4 Dec 2019 16:27:08 +0900 Subject: [PATCH] HBASE-23359 RS going down with NPE when splitting a region with compaction disabled in branch-1 --- .../apache/hadoop/hbase/regionserver/CompactSplitThread.java | 4 +++- 1 file changed, 3 insertions(+), 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 index ed4bd0da8e7e..f3ff124b143c 100644 --- 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 @@ -653,7 +653,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); + } } } }