瀏覽代碼

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

This reverts commit 4d2ee51c52d371a10501a76f5bfc2d78a40e2083.
cnauroth 9 年之前
父節點
當前提交
56882e7b1c

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

@@ -11,9 +11,6 @@ Release 2.7.3 - UNRELEASED
     HDFS-8647. Abstract BlockManager's rack policy into BlockPlacementPolicy.
     (Brahma Reddy Battula via mingma)
 
-    HDFS-9569. Log the name of the fsimage being loaded for better
-    supportability (Yongjun Zhang via kihwal)
-
   OPTIMIZATIONS
 
   BUG FIXES

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

@@ -675,8 +675,8 @@ public class FSImage implements Closeable {
         imageFile = imageFiles.get(i);
         loadFSImageFile(target, recovery, imageFile, startOpt);
         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();
         imageFile = null;
       }
@@ -727,7 +727,7 @@ public class FSImage implements Closeable {
 
   void loadFSImageFile(FSNamesystem target, MetaRecoveryContext recovery,
       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;
     storage.readProperties(sdForProperties, startupOption);