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 000AA106B3 for ; Wed, 18 Dec 2013 01:35:33 +0000 (UTC) Received: (qmail 72302 invoked by uid 500); 18 Dec 2013 01:35:33 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 72271 invoked by uid 500); 18 Dec 2013 01:35:33 -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 72264 invoked by uid 99); 18 Dec 2013 01:35:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Dec 2013 01:35:33 +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, 18 Dec 2013 01:35:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 723D6238889B; Wed, 18 Dec 2013 01:35:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1551796 - /hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Date: Wed, 18 Dec 2013 01:35:10 -0000 To: commits@hbase.apache.org From: apurtell@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131218013510.723D6238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: apurtell Date: Wed Dec 18 01:35:10 2013 New Revision: 1551796 URL: http://svn.apache.org/r1551796 Log: HBASE-10179. HRegionServer underreports readRequestCounts by 1 under certain conditions (Perry Trolard) Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Modified: hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1551796&r1=1551795&r2=1551796&view=diff ============================================================================== --- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original) +++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Wed Dec 18 01:35:10 2013 @@ -3055,7 +3055,7 @@ public class HRegionServer implements Cl int i = 0; synchronized(scanner) { for (; i < rows - && currentScanResultSize < maxResultSize; i++) { + && currentScanResultSize < maxResultSize; ) { // Collect values to be returned here boolean moreRows = scanner.nextRaw(values); if (!values.isEmpty()) { @@ -3065,6 +3065,7 @@ public class HRegionServer implements Cl } } results.add(Result.create(values)); + i++; } if (!moreRows) { break;