Repository: hadoop Updated Branches: refs/heads/branch-2 6944e7ef4 -> 68a32a79b refs/heads/branch-2.8 bf6d50cda -> 476f7d0be refs/heads/trunk 9f4bf3bdf -> de37f3754
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/de37f375 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/de37f375 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/de37f375 Branch: refs/heads/trunk Commit: de37f37543c2fb07ca53bb6000d50b36ec70d084 Parents: 9f4bf3b Author: Arpit Agarwal <[email protected]> Authored: Mon Jan 11 15:08:00 2016 -0800 Committer: Arpit Agarwal <[email protected]> Committed: Mon Jan 11 15:08:00 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/de37f375/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 f9e4cfd..b03cd96 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -2581,6 +2581,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/de37f375/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 d84b0fa..5e0f416 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 @@ -376,11 +376,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; } }
