Repository: hadoop Updated Branches: refs/heads/branch-2 3d0222eaf -> 03e10f1fb
HDFS-9569. Log the name of the fsimage being loaded for better supportability. Contributed by Yongjun Zhang. (cherry picked from commit eb6939cea0343840c62b930d4adb377f5eaf879f) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/03e10f1f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/03e10f1f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/03e10f1f Branch: refs/heads/branch-2 Commit: 03e10f1fb3fade650cb054ddf5f3a152871b8c0f Parents: 3d0222e Author: Kihwal Lee <kih...@apache.org> Authored: Thu Dec 17 10:30:58 2015 -0600 Committer: Kihwal Lee <kih...@apache.org> Committed: Thu Dec 17 10:30:58 2015 -0600 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/server/namenode/FSImage.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/03e10f1f/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index fa70307..268a589 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1644,6 +1644,9 @@ Release 2.7.3 - UNRELEASED IMPROVEMENTS + HDFS-9569. Log the name of the fsimage being loaded for better + supportability (Yongjun Zhang via kihwal) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/03e10f1f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java index 085c0f8..224d2c1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java +++ b/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); loadFSImageFile(target, recovery, imageFile, startOpt); break; - } catch (IOException ioe) { - LOG.error("Failed to load image from " + imageFile, ioe); + } catch (Exception e) { + LOG.error("Failed to load image from " + imageFile, e); target.clear(); imageFile = null; } @@ -725,7 +725,7 @@ public class FSImage implements Closeable { void loadFSImageFile(FSNamesystem target, MetaRecoveryContext recovery, FSImageFile imageFile, StartupOption startupOption) throws IOException { - LOG.debug("Planning to load image :\n" + imageFile); + LOG.info("Planning to load image: " + imageFile); StorageDirectory sdForProperties = imageFile.sd; storage.readProperties(sdForProperties, startupOption);