[hbase] branch branch-2.4 updated: HBASE-25693 NPE getting metrics from standby masters (MetricsMasterWrapperImpl.getMergePlanCount) (#3091)

[apurtell]

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

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


The following commit(s) were added to refs/heads/branch-2.4 by this push:
     new a11220d  HBASE-25693 NPE getting metrics from standby masters 
(MetricsMasterWrapperImpl.getMergePlanCount) (#3091)
a11220d is described below

commit a11220d3bf508daebd271ea03c5d3558ff6cf603
Author: Andrew Purtell <apurt...@apache.org>
AuthorDate: Wed Mar 24 19:09:10 2021 -0700

    HBASE-25693 NPE getting metrics from standby masters 
(MetricsMasterWrapperImpl.getMergePlanCount) (#3091)
    
    Signed-off-by: Duo Zhang <zhang...@apache.org>
    Signed-off-by: Nick Dimiduk <ndimi...@apache.org>
---
 .../org/apache/hadoop/hbase/master/MetricsMasterWrapperImpl.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapperImpl.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapperImpl.java
index 1bc5dd4..c4e1a2e 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapperImpl.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapperImpl.java
@@ -50,11 +50,17 @@ public class MetricsMasterWrapperImpl implements 
MetricsMasterWrapper {
 
   @Override
   public long getSplitPlanCount() {
+    if (master.getRegionNormalizerManager() == null) {
+      return 0;
+    }
     return master.getRegionNormalizerManager().getSplitPlanCount();
   }
 
   @Override
   public long getMergePlanCount() {
+    if (master.getRegionNormalizerManager() == null) {
+      return 0;
+    }
     return master.getRegionNormalizerManager().getMergePlanCount();
   }