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 cn...@apache.org on 2015/12/17 22:55:55 UTC
[3/4] hadoop git commit: Revert "HDFS-9569. Log the name of the
fsimage being loaded for better supportability. Contributed by Yongjun
Zhang."
Revert "HDFS-9569. Log the name of the fsimage being loaded for better supportability. Contributed by Yongjun Zhang."
This reverts commit eb6939cea0343840c62b930d4adb377f5eaf879f.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/db37f02d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/db37f02d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/db37f02d
Branch: refs/heads/trunk
Commit: db37f02dc704ad9eec8c56e3e466a5f37d138d74
Parents: f5756a2
Author: cnauroth <cn...@apache.org>
Authored: Thu Dec 17 13:50:23 2015 -0800
Committer: cnauroth <cn...@apache.org>
Committed: Thu Dec 17 13:50:23 2015 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 ---
.../java/org/apache/hadoop/hdfs/server/namenode/FSImage.java | 6 +++---
2 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/db37f02d/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 7019791..ea1a78a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -2518,9 +2518,6 @@ 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/db37f02d/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 3d58a7d..dedbb32 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 (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;
}
@@ -721,7 +721,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);