Author: suresh
Date: Fri Nov 30 22:55:49 2012
New Revision: 1415880
URL: http://svn.apache.org/viewvc?rev=1415880&view=rev
Log:
HDFS-4252. Merge 1415879 from branch-1 to branch-1.1
Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1415880&r1=1415879&r2=1415880&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Fri Nov 30 22:55:49 2012
@@ -8,6 +8,9 @@ Release 1.1.2 - 2012.11.18
IMPROVEMENTS
+ HDFS-4252. Improve confusing log message that prints exception when
editlog
+ read is completed. (Jing Zhao via suresh)
+
BUG FIXES
HDFS-3727. When using SPNEGO, NN should not try to log in using KSSL
Modified:
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java?rev=1415880&r1=1415879&r2=1415880&view=diff
==============================================================================
---
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
(original)
+++
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
Fri Nov 30 22:55:49 2012
@@ -584,6 +584,9 @@ public class FSEditLog {
break; // no more transactions
}
} catch (EOFException e) {
+ LOG.info("EOF of " + edits.getName() + ", reached end of edit log "
+ + "Number of transactions found: " + numEdits + ". "
+ + "Bytes read: " + tracker.getPos());
break; // no more transactions
}
recentOpcodeOffsets[numEdits % recentOpcodeOffsets.length] =
