From 9312de9502b8cbf2dca42aa2ebf9f3956f11940a Mon Sep 17 00:00:00 2001 From: Puleya7 Date: Fri, 17 May 2019 17:11:29 +0800 Subject: [PATCH] HBASE-22440. Fix NPE in HRegionServer#getWalGroupsReplicationStatus() --- .../java/org/apache/hadoop/hbase/regionserver/HRegionServer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 05a671a2ad..bbdefaa854 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 @@ -2998,8 +2998,7 @@ public class HRegionServer extends HasThread implements */ private static void createNewReplicationInstance(Configuration conf, HRegionServer server, FileSystem walFs, Path walDir, Path oldWALDir, WALProvider walProvider) throws IOException { - if ((server instanceof HMaster) && - (!LoadBalancer.isTablesOnMaster(conf) || LoadBalancer.isSystemTablesOnlyOnMaster(conf))) { + if ((server instanceof HMaster) && !LoadBalancer.isMasterCanHostUserRegions(conf)) { return; } @@ -3042,7 +3041,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)