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

HBASE-13851 RpcClientImpl.close() can hang with cancelled replica RPCs

This commit is contained in:
Enis Soztutar 2015-06-06 14:01:33 -07:00
parent c1d970b04d
commit 587b0b4f20
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
View File

@ -1113,6 +1113,16 @@ public class RpcClientImpl extends AbstractRpcClient {
synchronized (connections) { synchronized (connections) {
for (Connection conn : connections.values()) { for (Connection conn : connections.values()) {
conn.interrupt(); conn.interrupt();
if (conn.callSender != null) {
conn.callSender.interrupt();
}
// In case the CallSender did not setupIOStreams() yet, the Connection may not be started
// at all (if CallSender has a cancelled Call it can happen). See HBASE-13851
if (!conn.isAlive()) {
conn.markClosed(new InterruptedIOException("RpcClient is closing"));
conn.close();
}
} }
} }