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/21 04:49:19 UTC
[1/2] hadoop git commit: Revert "YARN-2977. Fixed intermittent
TestNMClient failure. (Contributed by Junping Du)"
Repository: hadoop
Updated Branches:
refs/heads/branch-2.6 341909163 -> 07b3329e3
Revert "YARN-2977. Fixed intermittent TestNMClient failure. (Contributed by Junping Du)"
This reverts commit d79f63120e16cb03f3f85b5d79a84202881a95a5.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ca121a78
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ca121a78
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ca121a78
Branch: refs/heads/branch-2.6
Commit: ca121a78fd6464a67d60c1fe14eea7109bdaf899
Parents: 3419091
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Sun Dec 21 12:47:28 2014 +0900
Committer: Tsuyoshi Ozawa <oz...@apache.org>
Committed: Sun Dec 21 12:47:28 2014 +0900
----------------------------------------------------------------------
.../apache/hadoop/yarn/client/api/impl/TestNMClient.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ca121a78/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 0d4a271..88dbf81 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,11 +344,10 @@ public class TestNMClient {
// getContainerStatus can be called after stopContainer
try {
// O is possible if CLEANUP_CONTAINER is executed too late
- // -105 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,
"Container killed by the ApplicationMaster.", Arrays.asList(
- new Integer[] {ContainerExitStatus.KILLED_BY_APPMASTER,
- ContainerExitStatus.SUCCESS}));
+ new Integer[] {ContainerExitStatus.KILLED_BY_APPMASTER}));
} catch (YarnException e) {
// The exception is possible because, after the container is stopped,
// it may be removed from NM's context.
@@ -384,10 +383,7 @@ public class TestNMClient {
assertEquals(container.getId(), status.getContainerId());
assertTrue("" + index + ": " + status.getDiagnostics(),
status.getDiagnostics().contains(diagnostics));
-
- assertTrue("Exit Statuses are supposed to be in: " + exitStatuses +
- ", but the actual exit status code is: " + status.getExitStatus(),
- exitStatuses.contains(status.getExitStatus()));
+ assertTrue(exitStatuses.contains(status.getExitStatus()));
break;
}
Thread.sleep(100);
[2/2] hadoop git commit: Revert "CHANGES.txt: add YARN-2977"
Posted by oz...@apache.org.
Revert "CHANGES.txt: add YARN-2977"
This reverts commit 3419091631777ec04dd1a9e2bf24adab2496c5ce.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/07b3329e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/07b3329e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/07b3329e
Branch: refs/heads/branch-2.6
Commit: 07b3329e3fc31e75bdab5030469e47c00d409602
Parents: ca121a7
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Sun Dec 21 12:47:30 2014 +0900
Committer: Tsuyoshi Ozawa <oz...@apache.org>
Committed: Sun Dec 21 12:47:30 2014 +0900
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 15 ---------------
1 file changed, 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/07b3329e/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 3e3373a..3eb6fbc 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1,20 +1,5 @@
Hadoop YARN Change Log
-Release 2.6.1 - Unreleased
-
- INCOMPATIBLE CHANGES
-
- NEW FEATURES
-
- IMPROVEMENTS
-
- OPTIMIZATIONS
-
- BUG FIXES
-
- YARN-2977. Fixed intermittent TestNMClient failure.
- (Junping Du via ozawa)
-
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES