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

HBASE-19748 TestRegionReplicaFailover and TestRegionReplicaReplicationEndpoint UT hangs

This commit is contained in:
huzheng 2018-01-10 15:00:30 +08:00 committed by zhangduo
parent 1c32241a00
commit a7dce36766
1 changed files with 4 additions and 5 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

@ -40,7 +40,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future; import java.util.concurrent.Future;
@ -71,6 +70,7 @@ import org.apache.hadoop.hbase.MasterNotRunningException;
import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.MetaTableAccessor;
import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.NamespaceDescriptor;
import org.apache.hadoop.hbase.PleaseHoldException; import org.apache.hadoop.hbase.PleaseHoldException;
import org.apache.hadoop.hbase.ReplicationPeerNotFoundException;
import org.apache.hadoop.hbase.ServerMetricsBuilder; import org.apache.hadoop.hbase.ServerMetricsBuilder;
import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableDescriptors; import org.apache.hadoop.hbase.TableDescriptors;
@ -3407,13 +3407,12 @@ public class HMaster extends HRegionServer implements MasterServices {
cpHost.preGetReplicationPeerConfig(peerId); cpHost.preGetReplicationPeerConfig(peerId);
} }
LOG.info(getClientIdAuditPrefix() + " get replication peer config, id=" + peerId); LOG.info(getClientIdAuditPrefix() + " get replication peer config, id=" + peerId);
Optional<ReplicationPeerConfig> peerConfig = ReplicationPeerConfig peerConfig = this.replicationPeerManager.getPeerConfig(peerId)
this.replicationPeerManager.getPeerConfig(peerId); .orElseThrow(() -> new ReplicationPeerNotFoundException(peerId));
if (cpHost != null) { if (cpHost != null) {
cpHost.postGetReplicationPeerConfig(peerId); cpHost.postGetReplicationPeerConfig(peerId);
} }
return peerConfig.orElse(null); return peerConfig;
} }
@Override @Override