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 2CCB59BF6 for ; Wed, 14 Dec 2011 19:56:48 +0000 (UTC) Received: (qmail 98555 invoked by uid 500); 14 Dec 2011 19:56:48 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 98527 invoked by uid 500); 14 Dec 2011 19:56:47 -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 98520 invoked by uid 99); 14 Dec 2011 19:56:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Dec 2011 19:56:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Dec 2011 19:56:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EB23C23889C5 for ; Wed, 14 Dec 2011 19:56:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1214430 - in /hbase/branches/0.92: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Date: Wed, 14 Dec 2011 19:56:23 -0000 To: commits@hbase.apache.org From: tedyu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111214195623.EB23C23889C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tedyu Date: Wed Dec 14 19:56:23 2011 New Revision: 1214430 URL: http://svn.apache.org/viewvc?rev=1214430&view=rev Log: HBASE-5026 Add coprocessor hook to HRegionServer.ScannerListener.leaseExpired() Modified: hbase/branches/0.92/CHANGES.txt hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Modified: hbase/branches/0.92/CHANGES.txt URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1214430&r1=1214429&r2=1214430&view=diff ============================================================================== --- hbase/branches/0.92/CHANGES.txt (original) +++ hbase/branches/0.92/CHANGES.txt Wed Dec 14 19:56:23 2011 @@ -486,6 +486,7 @@ Release 0.92.0 - Unreleased HBASE-4881 Unhealthy region is on service caused by rollback of region splitting (Chunhui Shen) HBASE-4997 SplitLogManager can have a race on batch.installed (Prakash Khemani) + HBASE-5026 Add coprocessor hook to HRegionServer.ScannerListener.leaseExpired() TESTS HBASE-4492 TestRollingRestart fails intermittently Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1214430&r1=1214429&r2=1214430&view=diff ============================================================================== --- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original) +++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Wed Dec 14 19:56:23 2011 @@ -2203,9 +2203,18 @@ public class HRegionServer implements HR RegionScanner s = scanners.remove(this.scannerName); if (s != null) { try { + HRegion region = getRegion(s.getRegionInfo().getRegionName()); + if (region != null && region.getCoprocessorHost() != null) { + region.getCoprocessorHost().preScannerClose(s); + } + s.close(); + if (region != null && region.getCoprocessorHost() != null) { + region.getCoprocessorHost().postScannerClose(s); + } } catch (IOException e) { - LOG.error("Closing scanner", e); + LOG.error("Closing scanner for " + + s.getRegionInfo().getRegionNameAsString(), e); } } }