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

Merge 1602043 from trunk to branch-2 for YARN-2148. TestNMClient failed due more exit code values added and passed to AM (Wangda Tan via bikas) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602045 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bikas Saha 2014-06-11 22:49:19 +00:00
parent cbec85322f
commit fe66a3b00b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,6 +218,9 @@ Release 2.5.0 - UNRELEASED
YARN-2124. Fixed NPE in ProportionalCapacityPreemptionPolicy. (Wangda Tan YARN-2124. Fixed NPE in ProportionalCapacityPreemptionPolicy. (Wangda Tan
via jianhe) via jianhe)
YARN-2148. TestNMClient failed due more exit code values added and passed
to AM (Wangda Tan via bikas)
Release 2.4.1 - UNRELEASED Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestNMClient.java
View File

@ -43,6 +43,7 @@ import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.api.records.ApplicationReport; import org.apache.hadoop.yarn.api.records.ApplicationReport;
import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext; import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.Container;
import org.apache.hadoop.yarn.api.records.ContainerExitStatus;
import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
import org.apache.hadoop.yarn.api.records.ContainerState; import org.apache.hadoop.yarn.api.records.ContainerState;
import org.apache.hadoop.yarn.api.records.ContainerStatus; import org.apache.hadoop.yarn.api.records.ContainerStatus;
@ -346,7 +347,7 @@ public class TestNMClient {
// 137 is possible if the container is not terminated but killed // 137 is possible if the container is not terminated but killed
testGetContainerStatus(container, i, ContainerState.COMPLETE, testGetContainerStatus(container, i, ContainerState.COMPLETE,
"Container killed by the ApplicationMaster.", Arrays.asList( "Container killed by the ApplicationMaster.", Arrays.asList(
new Integer[] {137, 143, 0})); new Integer[] {ContainerExitStatus.KILLED_BY_APPMASTER}));
} catch (YarnException e) { } catch (YarnException e) {
// The exception is possible because, after the container is stopped, // The exception is possible because, after the container is stopped,
// it may be removed from NM's context. // it may be removed from NM's context.