HBASE-19748 TestRegionReplicaFailover and TestRegionReplicaReplicationEndpoint UT hangs
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d5ddc7eb Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d5ddc7eb Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d5ddc7eb Branch: refs/heads/HBASE-19397-branch-2 Commit: d5ddc7eb1959917cb16d3b374c2dd77764dfcac2 Parents: 6fb48ee Author: huzheng <open...@gmail.com> Authored: Wed Jan 10 15:00:30 2018 +0800 Committer: zhangduo <zhang...@apache.org> Committed: Sun Feb 4 20:43:05 2018 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/master/HMaster.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/d5ddc7eb/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java ---------------------------------------------------------------------- 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 7dd6788..cb56764 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 @@ -40,7 +40,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Objects; -import java.util.Optional; import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; @@ -72,6 +71,7 @@ import org.apache.hadoop.hbase.MasterNotRunningException; import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.PleaseHoldException; +import org.apache.hadoop.hbase.ReplicationPeerNotFoundException; import org.apache.hadoop.hbase.ServerLoad; import org.apache.hadoop.hbase.ServerMetricsBuilder; import org.apache.hadoop.hbase.ServerName; @@ -3384,13 +3384,12 @@ public class HMaster extends HRegionServer implements MasterServices { cpHost.preGetReplicationPeerConfig(peerId); } LOG.info(getClientIdAuditPrefix() + " get replication peer config, id=" + peerId); - Optional<ReplicationPeerConfig> peerConfig = - this.replicationPeerManager.getPeerConfig(peerId); - + ReplicationPeerConfig peerConfig = this.replicationPeerManager.getPeerConfig(peerId) + .orElseThrow(() -> new ReplicationPeerNotFoundException(peerId)); if (cpHost != null) { cpHost.postGetReplicationPeerConfig(peerId); } - return peerConfig.orElse(null); + return peerConfig; } @Override
