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

HBASE-8360 In HBaseClient#cancelConnections we should close fully the connection 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1469952 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
nkeywal 2013-04-19 17:06:42 +00:00
parent efc32c83ba
commit e946c2871f
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Proxy; import java.lang.reflect.Proxy;
import java.lang.reflect.UndeclaredThrowableException; import java.lang.reflect.UndeclaredThrowableException;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.SocketException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
@ -653,7 +654,8 @@ public class HConnectionManager {
@Override @Override
public void newDead(ServerName sn) { public void newDead(ServerName sn) {
clearCaches(sn); clearCaches(sn);
rpcEngine.getClient().cancelConnections(sn.getHostname(), sn.getPort(), null); rpcEngine.getClient().cancelConnections(sn.getHostname(), sn.getPort(),
new SocketException(sn.getServerName() + " is dead: closing its connection."));
} }
}, conf, listenerClass); }, conf, listenerClass);
} }

7
hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java
View File

@ -1370,15 +1370,18 @@ public class HBaseClient {
if (connection.isAlive() && if (connection.isAlive() &&
connection.getRemoteAddress().getPort() == port && connection.getRemoteAddress().getPort() == port &&
connection.getRemoteAddress().getHostName().equals(hostname)) { connection.getRemoteAddress().getHostName().equals(hostname)) {
if (connection.shouldCloseConnection.compareAndSet(false, true)) {
LOG.info("The server on " + hostname + ":" + port + LOG.info("The server on " + hostname + ":" + port +
" is dead - stopping the connection " + connection.remoteId); " is dead - closing the connection " + connection.remoteId);
connection.closeConnection(); connection.closeException = ioe;
connection.close();
// We could do a connection.interrupt(), but it's safer not to do it, as the // We could do a connection.interrupt(), but it's safer not to do it, as the
// interrupted exception behavior is not defined nor enforced enough. // interrupted exception behavior is not defined nor enforced enough.
} }
} }
} }
} }
}
/* Get a connection from the pool, or create a new one and add it to the /* Get a connection from the pool, or create a new one and add it to the
* pool. Connections to a given host/port are reused. */ * pool. Connections to a given host/port are reused. */