Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1072811BA2 for ; Sat, 9 Aug 2014 02:36:28 +0000 (UTC) Received: (qmail 78198 invoked by uid 500); 9 Aug 2014 02:36:27 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 78081 invoked by uid 500); 9 Aug 2014 02:36:27 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 77911 invoked by uid 99); 9 Aug 2014 02:36:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Aug 2014 02:36:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2CB80952036; Sat, 9 Aug 2014 02:36:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: apurtell@apache.org To: commits@hbase.apache.org Date: Sat, 09 Aug 2014 02:36:32 -0000 Message-Id: <56f4cdf991a348b0b8c461af5f3966c4@git.apache.org> In-Reply-To: <1d97830785ec4687bf2bc239c5cd5cc0@git.apache.org> References: <1d97830785ec4687bf2bc239c5cd5cc0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/9] git commit: HBASE-11705 callQueueSize should be decremented in a fail-fast scenario (Esteban Gutierrez) 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/cb4ac0d3 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cb4ac0d3 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cb4ac0d3 Branch: refs/heads/0.98 Commit: cb4ac0d397a77f03715e431b87c8b67bff7aa18c Parents: b7b1d01 Author: Andrew Purtell Authored: Fri Aug 8 18:41:18 2014 -0700 Committer: Andrew Purtell Committed: Fri Aug 8 18:41:33 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/cb4ac0d3/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 31484bb..8a34a82 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); } }