big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-3006. Improve the error message when attempting manual failover with auto-failover enabled. (Akira AJISAKA via wangda)

Browse Source
This commit is contained in:
Wangda Tan 2015-05-01 16:40:44 -07:00
parent ac7d152901
commit 7d46a806e7
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAAdmin.java
View File

@ -279,7 +279,13 @@ private int failover(CommandLine cmd)
"supported with auto-failover enabled."); "supported with auto-failover enabled.");
return -1; 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(), FailoverController fc = new FailoverController(getConf(),

3
hadoop-yarn-project/CHANGES.txt
View File

@ -189,6 +189,9 @@ Release 2.8.0 - UNRELEASED
YARN-3469. ZKRMStateStore: Avoid setting watches that are not required. YARN-3469. ZKRMStateStore: Avoid setting watches that are not required.
(Jun Gong via kasha) (Jun Gong via kasha)
YARN-3006. Improve the error message when attempting manual failover with
auto-failover enabled. (Akira AJISAKA via wangda)
BUG FIXES BUG FIXES
YARN-3197. Confusing log generated by CapacityScheduler. (Varun Saxena YARN-3197. Confusing log generated by CapacityScheduler. (Varun Saxena