From 341d950d2c566987938f0802efe14755eb2a5d10 Mon Sep 17 00:00:00 2001 From: Puleya7 Date: Fri, 17 May 2019 16:24:56 +0800 Subject: [PATCH] HBASE-22440. Fix NPE in HRegionServer#getWalGroupsReplicationStatus() --- .../main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 6dc5ada993..3b1bf7d413 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -3072,7 +3072,8 @@ public class HRegionServer extends HasThread implements public Map getWalGroupsReplicationStatus(){ Map walGroupsReplicationStatus = new TreeMap<>(); - if(!this.isOnline()){ + if(!this.isOnline() || + (this instanceof HMaster && !LoadBalancer.isMasterCanHostUserRegions(conf))){ return walGroupsReplicationStatus; } List allSources = new ArrayList<>(); -- 2.11.0 (Apple Git-81)