[hbase] branch branch-1.4 updated: HBASE-23359 RS going down with NPE when splitting a region with compaction disabled in branch-1 (#899)

[brfrn169]

This is an automated email from the ASF dual-hosted git repository.

brfrn169 pushed a commit to branch branch-1.4
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-1.4 by this push:
     new c612a2e  HBASE-23359 RS going down with NPE when splitting a region 
with compaction disabled in branch-1 (#899)
c612a2e is described below

commit c612a2e3cc8118d60f4571a50ab4068bf1152478
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 09a3d06..2982e93 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
@@ -608,7 +608,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);
+        }
       }
     }
   }