You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by oz...@apache.org on 2014/12/20 14:35:53 UTC
hadoop git commit: YARN-2977. Fixed intermittent TestNMClient
failure. (Contributed by Junping Du)
Repository: hadoop
Updated Branches:
refs/heads/trunk c1f857b0b -> cf7fe583d
YARN-2977. Fixed intermittent TestNMClient failure. (Contributed by Junping Du)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cf7fe583
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cf7fe583
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cf7fe583
Branch: refs/heads/trunk
Commit: cf7fe583d14ebb16fc1b6e29dc2afbf67d24b9d1
Parents: c1f857b
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Sat Dec 20 22:35:28 2014 +0900
Committer: Tsuyoshi Ozawa <oz...@apache.org>
Committed: Sat Dec 20 22:35:28 2014 +0900
----------------------------------------------------------------------
.../apache/hadoop/yarn/client/api/impl/TestNMClient.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cf7fe583/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestNMClient.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestNMClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestNMClient.java
index 88dbf81..0d4a271 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestNMClient.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestNMClient.java
@@ -344,10 +344,11 @@ public class TestNMClient {
// getContainerStatus can be called after stopContainer
try {
// O is possible if CLEANUP_CONTAINER is executed too late
- // 137 is possible if the container is not terminated but killed
+ // -105 is possible if the container is not terminated but killed
testGetContainerStatus(container, i, ContainerState.COMPLETE,
"Container killed by the ApplicationMaster.", Arrays.asList(
- new Integer[] {ContainerExitStatus.KILLED_BY_APPMASTER}));
+ new Integer[] {ContainerExitStatus.KILLED_BY_APPMASTER,
+ ContainerExitStatus.SUCCESS}));
} catch (YarnException e) {
// The exception is possible because, after the container is stopped,
// it may be removed from NM's context.
@@ -383,7 +384,10 @@ public class TestNMClient {
assertEquals(container.getId(), status.getContainerId());
assertTrue("" + index + ": " + status.getDiagnostics(),
status.getDiagnostics().contains(diagnostics));
- assertTrue(exitStatuses.contains(status.getExitStatus()));
+
+ assertTrue("Exit Statuses are supposed to be in: " + exitStatuses +
+ ", but the actual exit status code is: " + status.getExitStatus(),
+ exitStatuses.contains(status.getExitStatus()));
break;
}
Thread.sleep(100);