Author: harsh Date: Wed Jul 11 03:37:55 2012 New Revision: 1360002 URL: http://svn.apache.org/viewvc?rev=1360002&view=rev Log: Backport of HDFS-3611 from trunk. svn merge -c 1360001 ../../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/namenode/EditLogFileInputStream.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=1360002&r1=1360001&r2=1360002&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:37:55 2012 @@ -121,6 +121,8 @@ Release 2.0.1-alpha - UNRELEASED HDFS-3613. GSet prints some INFO level values, which aren't really very useful to all (Andrew Wang via harsh) + HDFS-3611. NameNode prints unnecessary WARNs about edit log normally skipping a few bytes. (Colin Patrick McCabe 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/namenode/EditLogFileInputStream.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/namenode/EditLogFileInputStream.java?rev=1360002&r1=1360001&r2=1360002&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EditLogFileInputStream.java (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EditLogFileInputStream.java Wed Jul 11 03:37:55 2012 @@ -164,9 +164,11 @@ public class EditLogFileInputStream exte // long skipAmt = file.length() - tracker.getPos(); if (skipAmt > 0) { - LOG.warn("skipping " + skipAmt + " bytes at the end " + - "of edit log '" + getName() + "': reached txid " + txId + - " out of " + lastTxId); + if (LOG.isDebugEnabled()) { + LOG.debug("skipping " + skipAmt + " bytes at the end " + + "of edit log '" + getName() + "': reached txid " + txId + + " out of " + lastTxId); + } tracker.clearLimit(); IOUtils.skipFully(tracker, skipAmt); }