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 B81741848A for ; Thu, 24 Dec 2015 21:19:25 +0000 (UTC) Received: (qmail 26472 invoked by uid 500); 24 Dec 2015 21:19:25 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 26432 invoked by uid 500); 24 Dec 2015 21:19:25 -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 26423 invoked by uid 99); 24 Dec 2015 21:19:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Dec 2015 21:19:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 78143E381E; Thu, 24 Dec 2015 21:19:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: larsh@apache.org To: commits@hbase.apache.org Message-Id: <00e0989a858744c185dbc4cba8ad6b1d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-14822; addendum - handle callSeq. Date: Thu, 24 Dec 2015 21:19:25 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1.0 86d4e2084 -> 9c44260e5 HBASE-14822; addendum - handle callSeq. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9c44260e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9c44260e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9c44260e Branch: refs/heads/branch-1.0 Commit: 9c44260e510c1380767c1517c0c891089673c4e1 Parents: 86d4e20 Author: Lars Hofhansl Authored: Thu Dec 24 13:17:21 2015 -0800 Committer: Lars Hofhansl Committed: Thu Dec 24 13:17:21 2015 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/regionserver/RSRpcServices.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/9c44260e/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java index fe7ee2e..9c6de0f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java @@ -2078,9 +2078,12 @@ public class RSRpcServices implements HBaseRPCErrorHandler, ttl = this.scannerLeaseTimeoutPeriod; } if (request.hasRenew() && request.getRenew()) { + rsh = scanners.get(scannerName); lease = regionServer.leases.removeLease(scannerName); - if (lease != null && scanners.containsKey(scannerName)) { + if (lease != null && rsh != null) { regionServer.leases.addLease(lease); + // Increment the nextCallSeq value which is the next expected from client. + rsh.incNextCallSeq(); } return builder.build(); }