MAPREDUCE-5140. MR part of YARN-514 (Zhijie Shen via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1469060 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
ef9f251679
commit
9e650d36b7
|
@ -305,6 +305,8 @@ Release 2.0.5-beta - UNRELEASED
|
|||
MAPREDUCE-5151. Update MR AM to use standard exit codes from the API after
|
||||
YARN-444. (Sandy Ryza via vinodkv)
|
||||
|
||||
MAPREDUCE-5140. MR part of YARN-514 (Zhijie Shen via bikas)
|
||||
|
||||
Release 2.0.4-alpha - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -392,6 +392,7 @@ public class TypeConverter {
|
|||
FinalApplicationStatus finalApplicationStatus) {
|
||||
switch (yarnApplicationState) {
|
||||
case NEW:
|
||||
case NEW_SAVING:
|
||||
case SUBMITTED:
|
||||
case ACCEPTED:
|
||||
return State.PREP;
|
||||
|
|
|
@ -23,6 +23,7 @@ import java.util.List;
|
|||
import junit.framework.Assert;
|
||||
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.mapreduce.JobStatus.State;
|
||||
import org.apache.hadoop.mapreduce.v2.api.records.JobState;
|
||||
import org.apache.hadoop.mapreduce.v2.api.records.TaskState;
|
||||
import org.apache.hadoop.mapreduce.v2.api.records.TaskType;
|
||||
|
@ -48,6 +49,9 @@ public class TestTypeConverter {
|
|||
for (YarnApplicationState applicationState : YarnApplicationState.values()) {
|
||||
TypeConverter.fromYarn(applicationState, FinalApplicationStatus.FAILED);
|
||||
}
|
||||
// ad hoc test of NEW_SAVING, which is newly added
|
||||
Assert.assertEquals(State.PREP, TypeConverter.fromYarn(
|
||||
YarnApplicationState.NEW_SAVING, FinalApplicationStatus.FAILED));
|
||||
|
||||
for (TaskType taskType : TaskType.values()) {
|
||||
TypeConverter.fromYarn(taskType);
|
||||
|
|
|
@ -234,6 +234,8 @@ public class ClientServiceDelegate {
|
|||
throw RPCUtil.getRemoteException("User is not set in the application report");
|
||||
}
|
||||
if (application.getYarnApplicationState() == YarnApplicationState.NEW
|
||||
|| application.getYarnApplicationState() ==
|
||||
YarnApplicationState.NEW_SAVING
|
||||
|| application.getYarnApplicationState() == YarnApplicationState.SUBMITTED
|
||||
|| application.getYarnApplicationState() == YarnApplicationState.ACCEPTED) {
|
||||
realProxy = null;
|
||||
|
|
Loading…
Reference in New Issue