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 ar...@apache.org on 2016/01/12 00:10:56 UTC
[2/3] hadoop git commit: HDFS-9639. Inconsistent Logging in
BootstrapStandby. (Contributed by Xiaobing Zhou)
HDFS-9639. Inconsistent Logging in BootstrapStandby. (Contributed by Xiaobing Zhou)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/68a32a79
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/68a32a79
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/68a32a79
Branch: refs/heads/branch-2
Commit: 68a32a79b57684542264b3b8257743ad819d4ce8
Parents: 6944e7e
Author: Arpit Agarwal <ar...@apache.org>
Authored: Mon Jan 11 15:08:00 2016 -0800
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Mon Jan 11 15:09:43 2016 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../hadoop/hdfs/server/namenode/ha/BootstrapStandby.java | 7 ++-----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/68a32a79/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 39ae6b2..45d3315 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1695,6 +1695,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9493. Test o.a.h.hdfs.server.namenode.TestMetaSave fails in trunk.
(Tony Wu via lei)
+ HDFS-9639. Inconsistent Logging in BootstrapStandby. (Xiaobing Zhou via
+ Arpit Agarwal)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/68a32a79/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/BootstrapStandby.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/BootstrapStandby.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/BootstrapStandby.java
index 213141c..5e192ea 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/BootstrapStandby.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/BootstrapStandby.java
@@ -360,11 +360,8 @@ public class BootstrapStandby implements Tool, Configurable {
"Please copy these logs into the shared edits storage " +
"or call saveNamespace on the active node.\n" +
"Error: " + e.getLocalizedMessage();
- if (LOG.isDebugEnabled()) {
- LOG.debug(msg, e);
- } else {
- LOG.fatal(msg);
- }
+ LOG.fatal(msg, e);
+
return false;
}
}