From 8fb11b18d76d15b1ec36cf375f3d6e046783eee2 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 --- .../src/main/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 11a700ab85..137b55845b 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 @@ -192,6 +192,7 @@ import org.apache.hadoop.hbase.replication.SyncReplicationState; 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.SecurityConstants; import org.apache.hadoop.hbase.security.UserProvider; @@ -3991,4 +3992,12 @@ public class HMaster extends HRegionServer implements MasterServices { public SyncReplicationReplayWALManager getSyncReplicationReplayWALManager() { return this.syncReplicationReplayWALManager; } + + @Override + public Map getWalGroupsReplicationStatus() { + if (!this.isOnline() || !LoadBalancer.isMasterCanHostUserRegions(conf)) { + return new HashMap<>(); + } + return super.getWalGroupsReplicationStatus(); + } } -- 2.11.0 (Apple Git-81)