HBASE-11705 callQueueSize should be decremented in a fail-fast scenario (Esteban Gutierrez)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2df6b056 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2df6b056 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2df6b056 Branch: refs/heads/branch-1 Commit: 2df6b0562f0df6e4d1c5eafb9acbd486f3ed3b66 Parents: 59a49f3 Author: Andrew Purtell <[email protected]> Authored: Fri Aug 8 18:41:18 2014 -0700 Committer: Andrew Purtell <[email protected]> Committed: Fri Aug 8 18:41:28 2014 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/2df6b056/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java index 33474d4..c364786 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java @@ -110,7 +110,6 @@ public class CallRunner { RequestContext.clear(); } RpcServer.CurCall.set(null); - this.rpcServer.addCallSize(call.getSize() * -1); // Set the response for undelayed calls and delayed calls with // undelayed responses. if (!call.isDelayed() || !call.isReturnValueDelayed()) { @@ -139,6 +138,9 @@ public class CallRunner { } catch (Exception e) { RpcServer.LOG.warn(Thread.currentThread().getName() + ": caught: " + StringUtils.stringifyException(e)); + } finally { + // regardless if succesful or not we need to reset the callQueueSize + this.rpcServer.addCallSize(call.getSize() * -1); } }
