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);