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/476f7d0b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/476f7d0b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/476f7d0b Branch: refs/heads/branch-2.8 Commit: 476f7d0be3170d847111e27053f368c26527b726 Parents: bf6d50c Author: Arpit Agarwal <[email protected]> Authored: Mon Jan 11 15:08:00 2016 -0800 Committer: Arpit Agarwal <[email protected]> Committed: Mon Jan 11 15:10:21 2016 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 6 ++++++ .../hadoop/hdfs/server/namenode/ha/BootstrapStandby.java | 7 ++----- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/476f7d0b/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 7e4951f..d933d88 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1645,6 +1645,12 @@ Release 2.8.0 - UNRELEASED HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally. (Xiao Chen via zhz) + 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/476f7d0b/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; } }
