From 9d480246cf0126014076d20c241145658aa62940 Mon Sep 17 00:00:00 2001 From: Puleya7 Date: Fri, 17 May 2019 16:57:11 +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 fb1bbba842..f18dbf1b07 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 @@ -2838,7 +2838,8 @@ public class HRegionServer extends HasThread implements public Map getWalGroupsReplicationStatus(){ Map walGroupsReplicationStatus = new TreeMap<>(); - if(!this.isOnline()){ + if(!this.isOnline() || + ((this instanceof HMaster) && (!BaseLoadBalancer.userTablesOnMaster(conf)))){ return walGroupsReplicationStatus; } List allSources = new ArrayList<>(); -- 2.11.0 (Apple Git-81)