Return-Path: Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org Received: (qmail 45418 invoked from network); 1 May 2009 13:43:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 May 2009 13:43:32 -0000 Received: (qmail 24143 invoked by uid 500); 1 May 2009 13:43:31 -0000 Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org Received: (qmail 24059 invoked by uid 500); 1 May 2009 13:43:31 -0000 Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: core-dev@hadoop.apache.org Delivered-To: mailing list core-commits@hadoop.apache.org Received: (qmail 24050 invoked by uid 99); 1 May 2009 13:43:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 May 2009 13:43:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 01 May 2009 13:43:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E2F9F23888AF; Fri, 1 May 2009 13:43:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r770681 - in /hadoop/core/trunk: CHANGES.txt src/core/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java Date: Fri, 01 May 2009 13:43:10 -0000 To: core-commits@hadoop.apache.org From: tomwhite@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090501134310.E2F9F23888AF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tomwhite Date: Fri May 1 13:43:10 2009 New Revision: 770681 URL: http://svn.apache.org/viewvc?rev=770681&view=rev Log: HADOOP-5656. Counter for S3N Read Bytes does not work. Contributed by Ian Nowland. Modified: hadoop/core/trunk/CHANGES.txt hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java Modified: hadoop/core/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=770681&r1=770680&r2=770681&view=diff ============================================================================== --- hadoop/core/trunk/CHANGES.txt (original) +++ hadoop/core/trunk/CHANGES.txt Fri May 1 13:43:10 2009 @@ -474,6 +474,9 @@ HADOOP-5592. Fix typo in Streaming doc in reference to GzipCodec. (Corinne Chandel via tomwhite) + HADOOP-5656. Counter for S3N Read Bytes does not work. (Ian Nowland + via tomwhite) + Release 0.20.1 - Unreleased INCOMPATIBLE CHANGES Modified: hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java?rev=770681&r1=770680&r2=770681&view=diff ============================================================================== --- hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java (original) +++ hadoop/core/trunk/src/core/org/apache/hadoop/fs/s3native/NativeS3FileSystem.java Fri May 1 13:43:10 2009 @@ -90,6 +90,9 @@ if (result != -1) { pos++; } + if (statistics != null && result != -1) { + statistics.incrementBytesRead(1); + } return result; } public synchronized int read(byte[] b, int off, int len) @@ -99,6 +102,9 @@ if (result > 0) { pos += result; } + if (statistics != null && result > 0) { + statistics.incrementBytesRead(result); + } return result; }