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

HBASE-12951 TestHCM.testConnectionClose is flakey when using AsyncRpcClient as client implementation 

Signed-off-by: stack <stack@apache.org>
This commit is contained in:
zhangduo 2015-02-02 11:46:22 +08:00 committed by stack
parent 86b8b8da00
commit fef78acf65
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
View File

@ -108,7 +108,7 @@ public class AsyncRpcChannel {
private Token<? extends TokenIdentifier> token; private Token<? extends TokenIdentifier> token;
private String serverPrincipal; private String serverPrincipal;
boolean shouldCloseConnection = false; volatile boolean shouldCloseConnection = false;
private IOException closeException; private IOException closeException;
private Timeout cleanupTimer; private Timeout cleanupTimer;
@ -313,6 +313,13 @@ public class AsyncRpcChannel {
calls.put(call.id, call); calls.put(call.id, call);
// check again, see https://issues.apache.org/jira/browse/HBASE-12951
if (shouldCloseConnection) {
Promise<Message> promise = channel.eventLoop().newPromise();
promise.setFailure(new ConnectException());
return promise;
}
// Add timeout for cleanup if none is present // Add timeout for cleanup if none is present
if (cleanupTimer == null) { if (cleanupTimer == null) {
cleanupTimer = AsyncRpcClient.WHEEL_TIMER.newTimeout(timeoutTask, call.getRpcTimeout(), cleanupTimer = AsyncRpcClient.WHEEL_TIMER.newTimeout(timeoutTask, call.getRpcTimeout(),