Browse Source

Revert "HDFS-9569. Log the name of the fsimage being loaded for better supportability. Contributed by Yongjun Zhang."

This reverts commit eb6939cea0343840c62b930d4adb377f5eaf879f.
cnauroth 9 years ago
parent
commit
db37f02dc7

+ 0 - 3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -2518,9 +2518,6 @@ Release 2.7.3 - UNRELEASED
 
 
   IMPROVEMENTS
   IMPROVEMENTS
 
 
-    HDFS-9569. Log the name of the fsimage being loaded for better
-    supportability (Yongjun Zhang via kihwal)
-
   OPTIMIZATIONS
   OPTIMIZATIONS
 
 
   BUG FIXES
   BUG FIXES

+ 3 - 3
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java

@@ -671,8 +671,8 @@ public class FSImage implements Closeable {
         imageFile = imageFiles.get(i);
         imageFile = imageFiles.get(i);
         loadFSImageFile(target, recovery, imageFile, startOpt);
         loadFSImageFile(target, recovery, imageFile, startOpt);
         break;
         break;
-      } catch (Exception e) {
-        LOG.error("Failed to load image from " + imageFile, e);
+      } catch (IOException ioe) {
+        LOG.error("Failed to load image from " + imageFile, ioe);
         target.clear();
         target.clear();
         imageFile = null;
         imageFile = null;
       }
       }
@@ -721,7 +721,7 @@ public class FSImage implements Closeable {
 
 
   void loadFSImageFile(FSNamesystem target, MetaRecoveryContext recovery,
   void loadFSImageFile(FSNamesystem target, MetaRecoveryContext recovery,
       FSImageFile imageFile, StartupOption startupOption) throws IOException {
       FSImageFile imageFile, StartupOption startupOption) throws IOException {
-    LOG.info("Planning to load image: " + imageFile);
+    LOG.debug("Planning to load image :\n" + imageFile);
     StorageDirectory sdForProperties = imageFile.sd;
     StorageDirectory sdForProperties = imageFile.sd;
     storage.readProperties(sdForProperties, startupOption);
     storage.readProperties(sdForProperties, startupOption);