Repository: hadoop Updated Branches: refs/heads/branch-2 1e1ebbb42 -> c64309f6a
HADOOP-11328. ZKFailoverController does not log Exception when doRun raises errors. Contributed by Tianyin Xu. (cherry picked from commit bb9ddef0e7603b60d25250bb53a7ae9f147cd3cd) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c64309f6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c64309f6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c64309f6 Branch: refs/heads/branch-2 Commit: c64309f6ab6ba282420b11078941ca5512a0eff9 Parents: 1e1ebbb Author: Tsuyoshi Ozawa <oz...@apache.org> Authored: Mon May 4 17:47:37 2015 +0900 Committer: Tsuyoshi Ozawa <oz...@apache.org> Committed: Mon May 4 17:47:52 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/ha/ZKFailoverController.java | 1 + 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c64309f6/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 0c55598..945c9db 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -67,6 +67,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11357. Print information of the build enviornment in test-patch.sh (aw) + HADOOP-11328. ZKFailoverController does not log Exception when doRun raises + errors. (Tianyin Xu via ozawa) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp http://git-wip-us.apache.org/repos/asf/hadoop/blob/c64309f6/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java index f58c3f4..9eb1ff8 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java @@ -180,6 +180,7 @@ public abstract class ZKFailoverController { } }); } catch (RuntimeException rte) { + LOG.fatal("The failover controller encounters runtime error: " + rte); throw (Exception)rte.getCause(); } }
