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

HBASE-3653 : Parallelize Server Requests on HBase Client 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1082648 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nicolas Spiegelberg 2011-03-17 19:08:50 +00:00
parent a50c7d8dfc
commit b9e1d6c698
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -77,6 +77,7 @@ Release 0.91.0 - Unreleased
Export (Subbu M Iyer via Stack) Export (Subbu M Iyer via Stack)
HBASE-3440 Clean out load_table.rb and make sure all roads lead to HBASE-3440 Clean out load_table.rb and make sure all roads lead to
completebulkload tool (Vidhyashankar Venkataraman via Stack) completebulkload tool (Vidhyashankar Venkataraman via Stack)
HBASE-3653 Parallelize Server Requests on HBase Client
TASK TASK
HBASE-3559 Move report of split to master OFF the heartbeat channel HBASE-3559 Move report of split to master OFF the heartbeat channel

38
src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
View File

@ -240,6 +240,7 @@ public class HConnectionManager {
private final Map<String, HRegionInterface> servers = private final Map<String, HRegionInterface> servers =
new ConcurrentHashMap<String, HRegionInterface>(); new ConcurrentHashMap<String, HRegionInterface>();
private final ConcurrentHashMap<String, String> connectionLock = new ConcurrentHashMap<String, String>();
/** /**
* Map of table to table {@link HRegionLocation}s. The table key is made * Map of table to table {@link HRegionLocation}s. The table key is made
@ -941,21 +942,30 @@ public class HConnectionManager {
getMaster(); getMaster();
} }
HRegionInterface server; HRegionInterface server;
synchronized (this.servers) { String rsName = regionServer.toString();
// See if we already have a connection // See if we already have a connection (common case)
server = this.servers.get(regionServer.toString()); server = this.servers.get(rsName);
if (server == null) { // Get a connection if (server == null) {
try { // create a unique lock for this RS (if necessary)
server = (HRegionInterface)HBaseRPC.waitForProxy( this.connectionLock.putIfAbsent(rsName, rsName);
serverInterfaceClass, HRegionInterface.VERSION, // get the RS lock
regionServer.getInetSocketAddress(), this.conf, synchronized (this.connectionLock.get(rsName)) {
this.maxRPCAttempts, this.rpcTimeout, this.rpcTimeout); // do one more lookup in case we were stalled above
} catch (RemoteException e) { server = this.servers.get(rsName);
LOG.warn("RemoteException connecting to RS", e); if (server == null) {
// Throw what the RemoteException was carrying. try {
throw RemoteExceptionHandler.decodeRemoteException(e); // definitely a cache miss. establish an RPC for this RS
server = (HRegionInterface) HBaseRPC.waitForProxy(
serverInterfaceClass, HRegionInterface.VERSION,
regionServer.getInetSocketAddress(), this.conf,
this.maxRPCAttempts, this.rpcTimeout, this.rpcTimeout);
this.servers.put(rsName, server);
} catch (RemoteException e) {
LOG.warn("RemoteException connecting to RS", e);
// Throw what the RemoteException was carrying.
throw RemoteExceptionHandler.decodeRemoteException(e);
}
} }
this.servers.put(regionServer.toString(), server);
} }
} }
return server; return server;