Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-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 7B1C9D934 for ; Thu, 20 Sep 2012 19:50:21 +0000 (UTC) Received: (qmail 64273 invoked by uid 500); 20 Sep 2012 19:50:21 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 64141 invoked by uid 500); 20 Sep 2012 19:50:20 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 64131 invoked by uid 99); 20 Sep 2012 19:50:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Sep 2012 19:50:20 +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; Thu, 20 Sep 2012 19:50:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 49A3323888E4 for ; Thu, 20 Sep 2012 19:49:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1388184 - in /hadoop/common/branches/branch-1: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java Date: Thu, 20 Sep 2012 19:49:34 -0000 To: common-commits@hadoop.apache.org From: suresh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120920194934.49A3323888E4@eris.apache.org> Author: suresh Date: Thu Sep 20 19:49:33 2012 New Revision: 1388184 URL: http://svn.apache.org/viewvc?rev=1388184&view=rev Log: HDFS-3961. FSEditLog preallocate() preallocated more than 1MB. Contributed by Jing Zhoa. Modified: hadoop/common/branches/branch-1/CHANGES.txt hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java Modified: hadoop/common/branches/branch-1/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1388184&r1=1388183&r2=1388184&view=diff ============================================================================== --- hadoop/common/branches/branch-1/CHANGES.txt (original) +++ hadoop/common/branches/branch-1/CHANGES.txt Thu Sep 20 19:49:33 2012 @@ -565,6 +565,9 @@ Release 1.1.0 - unreleased HDFS-3466. Get HTTP kerberos principal from the web authentication keytab. (omalley) + HDFS-3961. FSEditLog preallocate() preallocated more than 1MB. (Jing Zhoa + via suresh) + Release 1.0.4 - Unreleased NEW FEATURES Modified: hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java?rev=1388184&r1=1388183&r2=1388184&view=diff ============================================================================== --- hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java (original) +++ hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java Thu Sep 20 19:49:33 2012 @@ -265,8 +265,8 @@ public class FSEditLog { long oldSize = size; long total = 0; long fillCapacity = PREALLOCATION_BUFFER.capacity(); - PREALLOCATION_BUFFER.position(0); while (need > 0) { + PREALLOCATION_BUFFER.position(0); do { size += fc.write(PREALLOCATION_BUFFER, size); } while (PREALLOCATION_BUFFER.remaining() > 0);