فهرست منبع

HDFS-4880. Print the image and edits file loaded by the namenode in the logs. Contributed by Arpit Agarwal.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1490758 13f79535-47bb-0310-9956-ffa450edef68
Suresh Srinivas 12 سال پیش
والد
کامیت
cffa54fab5

+ 3 - 0
CHANGES.txt

@@ -14,6 +14,9 @@ Release 1.3.0 - unreleased
     HADOOP-9573. Fix test-patch script to work with the enhanced
     PreCommit-Admin script.(Giridharan Kesavan)
 
+    HDFS-4880. Print the image and edits file loaded by the namenode in the
+    logs. (Arpit Agarwal via suresh)
+
   BUG FIXES
 
     MAPREDUCE-5047. keep.failed.task.files=true causes job failure on 

+ 2 - 0
src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java

@@ -637,6 +637,8 @@ public class FSEditLog {
     long highestGenStamp = -1;
     long startTime = FSNamesystem.now();
 
+    LOG.info("Start loading edits file " + edits.getName());
+    //
     // Keep track of the file offsets of the last several opcodes.
     // This is handy when manually recovering corrupted edits files.
     PositionTrackingInputStream tracker = 

+ 9 - 5
src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSImage.java

@@ -823,14 +823,17 @@ public class FSImage extends Storage {
     needToSave |= recoverInterruptedCheckpoint(latestNameSD, latestEditsSD);
 
     long startTime = FSNamesystem.now();
-    long imageSize = getImageFile(latestNameSD, NameNodeFile.IMAGE).length();
+    File imageFile = getImageFile(latestNameSD, NameNodeFile.IMAGE);
+    long imageSize = imageFile.length();
 
     //
     // Load in bits
     //
     latestNameSD.read();
-    needToSave |= loadFSImage(getImageFile(latestNameSD, NameNodeFile.IMAGE));
-    LOG.info("Image file of size " + imageSize + " loaded in " 
+    LOG.info("Start loading image file " + imageFile.getPath().toString());
+    needToSave |= loadFSImage(imageFile);
+    LOG.info("Image file " + imageFile.getPath().toString() +
+        " of size " + imageSize + " bytes loaded in "
         + (FSNamesystem.now() - startTime)/1000 + " seconds.");
     
     // Load latest edits
@@ -1067,8 +1070,9 @@ public class FSImage extends Storage {
       out.close();
     }
 
-    LOG.info("Image file of size " + newFile.length() + " saved in " 
-        + (FSNamesystem.now() - startTime)/1000 + " seconds.");
+    LOG.info("Image file " + newFile + " of size " + newFile.length() +
+        " bytes saved in " + (FSNamesystem.now() - startTime)/1000 +
+        " seconds.");
   }
 
   /**