You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ki...@apache.org on 2015/12/17 17:30:30 UTC
hadoop git commit: HDFS-9569. Log the name of the fsimage being
loaded for better supportability. Contributed by Yongjun Zhang.
Repository: hadoop
Updated Branches:
refs/heads/trunk d90625e03 -> eb6939cea
HDFS-9569. Log the name of the fsimage being loaded for better supportability. Contributed by Yongjun Zhang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eb6939ce
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eb6939ce
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eb6939ce
Branch: refs/heads/trunk
Commit: eb6939cea0343840c62b930d4adb377f5eaf879f
Parents: d90625e
Author: Kihwal Lee <ki...@apache.org>
Authored: Thu Dec 17 10:29:41 2015 -0600
Committer: Kihwal Lee <ki...@apache.org>
Committed: Thu Dec 17 10:29:41 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/eb6939ce/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 cf2e77c..c8e5748 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -2506,6 +2506,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/eb6939ce/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 dedbb32..3d58a7d 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;
}
@@ -721,7 +721,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);