Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

(cherry picked from commit 7d46a806e7)
(cherry picked from commit 4151e5729a)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
This commit is contained in:
Wangda Tan 2015-05-01 16:40:44 -07:00
parent 472fd563e4
commit 3389bac42a
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 @@ 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(),

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

@ -13,6 +13,9 @@ Release 2.7.1 - UNRELEASED
OPTIMIZATIONS
YARN-3006. Improve the error message when attempting manual failover with
auto-failover enabled. (Akira AJISAKA via wangda)
BUG FIXES
YARN-3487. CapacityScheduler scheduler lock obtained unnecessarily when