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

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

This reverts commit eb6939cea0.
This commit is contained in:
cnauroth 2015-12-17 13:50:23 -08:00
parent f5756a2038
commit db37f02dc7
2 changed files with 3 additions and 6 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

@ -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

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
View File

@ -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) { } catch (IOException ioe) {
LOG.error("Failed to load image from " + imageFile, e); 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);