Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-4880. Merge 1490746 fron trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490748 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-06-07 17:39:18 +00:00
parent 4937b65732
commit ae1c931095
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -154,6 +154,9 @@ Release 2.1.0-beta - UNRELEASED
HDFS-4234. Use generic code for choosing datanode in Balancer. (szetszwo) HDFS-4234. Use generic code for choosing datanode in Balancer. (szetszwo)
HDFS-4880. Print the image and edits file loaded by the namenode in the
logs. (Arpit Agarwal via suresh)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

1
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
View File

@ -96,6 +96,7 @@ public class FSEditLogLoader {
fsNamesys.writeLock(); fsNamesys.writeLock();
try { try {
long startTime = now(); long startTime = now();
FSImage.LOG.info("Start loading edits file " + edits.getName());
long numEdits = loadEditRecords(edits, false, long numEdits = loadEditRecords(edits, false,
expectedStartingTxId, recovery); expectedStartingTxId, recovery);
FSImage.LOG.info("Edits file " + edits.getName() FSImage.LOG.info("Edits file " + edits.getName()

8
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java
View File

@ -325,8 +325,8 @@ public class FSImageFormat {
imgDigest = new MD5Hash(digester.digest()); imgDigest = new MD5Hash(digester.digest());
loaded = true; loaded = true;
LOG.info("Image file of size " + curFile.length() + " loaded in " LOG.info("Image file " + curFile + " of size " + curFile.length() +
+ (now() - startTime)/1000 + " seconds."); " bytes loaded in " + (now() - startTime)/1000 + " seconds.");
} }
/** Update the root node's attributes */ /** Update the root node's attributes */
@ -872,8 +872,8 @@ public class FSImageFormat {
// set md5 of the saved image // set md5 of the saved image
savedDigest = new MD5Hash(digester.digest()); savedDigest = new MD5Hash(digester.digest());
LOG.info("Image file of size " + newFile.length() + " saved in " LOG.info("Image file " + newFile + " of size " + newFile.length() +
+ (now() - startTime)/1000 + " seconds."); " bytes saved in " + (now() - startTime)/1000 + " seconds.");
} }
/** /**