From 229570bd35b8bd5005282a0809632abb62d14811 Mon Sep 17 00:00:00 2001
From: Andrew Purtell <apurtell@apache.org>
Date: Wed, 24 Mar 2021 17:07:54 -0700
Subject: [PATCH] HBASE-25693 NPE getting metrics from standby masters
 (MetricsMasterWrapperImpl.getMergePlanCount)

---
 .../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 e03c4df3aa35..d65b0291366b 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
@@ -55,11 +55,17 @@ public double getAverageLoad() {
 
   @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();
   }