This is an automated email from the ASF dual-hosted git repository. brfrn169 pushed a commit to branch branch-1 in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-1 by this push: new 737eaa6 HBASE-23359 RS going down with NPE when splitting a region with compaction disabled in branch-1 (#899) 737eaa6 is described below commit 737eaa635a8d6e81e5ebac3b31c81096e24d3635 Author: Toshihiro Suzuki <brfrn...@gmail.com> AuthorDate: Wed Dec 4 21:24:03 2019 +0900 HBASE-23359 RS going down with NPE when splitting a region with compaction disabled in branch-1 (#899) Signed-off-by: Balazs Meszaros <meszib...@apache.org> Signed-off-by Anoop Sam John <anoopsamj...@apache.org> --- .../java/org/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 ed4bd0d..f3ff124 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 class CompactSplitThread implements CompactionRequestor, PropagatingConfi 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); + } } } }