From 4b7e256cc6072de1bb898314a58a0ca0c997df2f Mon Sep 17 00:00:00 2001 From: Puleya7 Date: Sat, 18 May 2019 17:17:38 +0800 Subject: [PATCH] HBASE-22440. Override getWalGroupsReplicationStatus to avoid NPE Signed-off-by: Duo Zhang --- .../java/org/apache/hadoop/hbase/master/HMaster.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 99e677b2c4c..58fd5df6feb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -183,6 +183,7 @@ import org.apache.hadoop.hbase.replication.ReplicationUtils; import org.apache.hadoop.hbase.replication.master.ReplicationHFileCleaner; import org.apache.hadoop.hbase.replication.master.ReplicationLogCleaner; import org.apache.hadoop.hbase.replication.master.ReplicationPeerConfigUpgrader; +import org.apache.hadoop.hbase.replication.regionserver.ReplicationStatus; import org.apache.hadoop.hbase.security.AccessDeniedException; import org.apache.hadoop.hbase.security.UserProvider; import org.apache.hadoop.hbase.trace.TraceUtil; @@ -3851,4 +3852,12 @@ public class HMaster extends HRegionServer implements MasterServices { } } } + + @Override + public Map getWalGroupsReplicationStatus() { + if (!this.isOnline() || !LoadBalancer.isMasterCanHostUserRegions(conf)) { + return new HashMap<>(); + } + return super.getWalGroupsReplicationStatus(); + } }