Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-22440. Override getWalGroupsReplicationStatus to avoid NPE 

Signed-off-by: Duo Zhang <zhangduo@apache.org>
This commit is contained in:
Puleya7 2019-05-18 17:17:38 +08:00 committed by Duo Zhang
parent f1a8aa4fd7
commit f773043f87
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

@ -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.ReplicationHFileCleaner;
import org.apache.hadoop.hbase.replication.master.ReplicationLogCleaner; import org.apache.hadoop.hbase.replication.master.ReplicationLogCleaner;
import org.apache.hadoop.hbase.replication.master.ReplicationPeerConfigUpgrader; 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.AccessDeniedException;
import org.apache.hadoop.hbase.security.SecurityConstants; import org.apache.hadoop.hbase.security.SecurityConstants;
import org.apache.hadoop.hbase.security.UserProvider; import org.apache.hadoop.hbase.security.UserProvider;
@ -3991,4 +3992,12 @@ public class HMaster extends HRegionServer implements MasterServices {
public SyncReplicationReplayWALManager getSyncReplicationReplayWALManager() { public SyncReplicationReplayWALManager getSyncReplicationReplayWALManager() {
return this.syncReplicationReplayWALManager; return this.syncReplicationReplayWALManager;
} }
@Override
public Map<String, ReplicationStatus> getWalGroupsReplicationStatus() {
if (!this.isOnline() || !LoadBalancer.isMasterCanHostUserRegions(conf)) {
return new HashMap<>();
}
return super.getWalGroupsReplicationStatus();
}
} }