Author: harsh Date: Wed Jul 11 03:15:54 2012 New Revision: 1360000 URL: http://svn.apache.org/viewvc?rev=1360000&view=rev Log: Backport of HDFS-3613 from trunk. svn merge -c 1359999 ../../trunk (harsh)
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/LightWeightGSet.java Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1360000&r1=1359999&r2=1360000&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Jul 11 03:15:54 2012 @@ -118,6 +118,9 @@ Release 2.0.1-alpha - UNRELEASED HDFS-3629. Fix the typo in the error message about inconsistent storage layout version. (Brandon Li via harsh) + HDFS-3613. GSet prints some INFO level values, which aren't + really very useful to all (Andrew Wang via harsh) + OPTIMIZATIONS HDFS-2982. Startup performance suffers when there are many edit log Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java?rev=1360000&r1=1359999&r2=1360000&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java Wed Jul 11 03:15:54 2012 @@ -81,10 +81,12 @@ class BlocksMap { final int exponent = e2 < 0? 0: e2 > 30? 30: e2; final int c = 1 << exponent; - LightWeightGSet.LOG.info("VM type = " + vmBit + "-bit"); - LightWeightGSet.LOG.info("2% max memory = " + twoPC/(1 << 20) + " MB"); - LightWeightGSet.LOG.info("capacity = 2^" + exponent - + " = " + c + " entries"); + if (LightWeightGSet.LOG.isDebugEnabled()) { + LightWeightGSet.LOG.debug("VM type = " + vmBit + "-bit"); + LightWeightGSet.LOG.debug("2% max memory = " + twoPC/(1 << 20) + " MB"); + LightWeightGSet.LOG.debug("capacity = 2^" + exponent + + " = " + c + " entries"); + } return c; } Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/LightWeightGSet.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/LightWeightGSet.java?rev=1360000&r1=1359999&r2=1360000&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/LightWeightGSet.java (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/LightWeightGSet.java Wed Jul 11 03:15:54 2012 @@ -79,7 +79,9 @@ public class LightWeightGSet<K, E extend */ public LightWeightGSet(final int recommended_length) { final int actual = actualArrayLength(recommended_length); - LOG.info("recommended=" + recommended_length + ", actual=" + actual); + if (LOG.isDebugEnabled()) { + LOG.debug("recommended=" + recommended_length + ", actual=" + actual); + } entries = new LinkedElement[actual]; hash_mask = entries.length - 1;