Repository: hadoop Updated Branches: refs/heads/branch-2 8e3fdd0a4 -> 4151e5729
YARN-3006. Improve the error message when attempting manual failover with auto-failover enabled. (Akira AJISAKA via wangda) (cherry picked from commit 7d46a806e71de6692cd230e64e7de18a8252019d) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4151e572 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4151e572 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4151e572 Branch: refs/heads/branch-2 Commit: 4151e5729a1ed74ac94035d66876b2dcc52eaaaf Parents: 8e3fdd0 Author: Wangda Tan <wan...@apache.org> Authored: Fri May 1 16:40:44 2015 -0700 Committer: Wangda Tan <wan...@apache.org> Committed: Fri May 1 16:44:49 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/ha/HAAdmin.java | 8 +++++++- hadoop-yarn-project/CHANGES.txt | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4151e572/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java index 9c28eb9..aa19ee2 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java @@ -279,7 +279,13 @@ public abstract class HAAdmin extends Configured implements Tool { "supported with auto-failover enabled."); return -1; } - return gracefulFailoverThroughZKFCs(toNode); + try { + return gracefulFailoverThroughZKFCs(toNode); + } catch (UnsupportedOperationException e){ + errOut.println("Failover command is not supported with " + + "auto-failover enabled: " + e.getLocalizedMessage()); + return -1; + } } FailoverController fc = new FailoverController(getConf(), http://git-wip-us.apache.org/repos/asf/hadoop/blob/4151e572/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 966d544..85f5bf8 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -141,6 +141,9 @@ Release 2.8.0 - UNRELEASED YARN-3469. ZKRMStateStore: Avoid setting watches that are not required. (Jun Gong via kasha) + YARN-3006. Improve the error message when attempting manual failover with + auto-failover enabled. (Akira AJISAKA via wangda) + BUG FIXES YARN-3197. Confusing log generated by CapacityScheduler. (Varun Saxena
