Repository: hadoop Updated Branches: refs/heads/branch-2 fdb886d65 -> 100b41add
YARN-3564. Fix TestContainerAllocation.testAMContainerAllocationWhenDNSUnavailable fails randomly. (Jian He via wangda) (cherry picked from commit e2e8f771183df798e926abc97116316a05b19c9a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/100b41ad Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/100b41ad Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/100b41ad Branch: refs/heads/branch-2 Commit: 100b41add6632da6ffa928e27a24caa87ad86eb7 Parents: fdb886d Author: Wangda Tan <wan...@apache.org> Authored: Thu Apr 30 11:03:13 2015 -0700 Committer: Wangda Tan <wan...@apache.org> Committed: Thu Apr 30 11:06:47 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../scheduler/capacity/TestContainerAllocation.java | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/100b41ad/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index fe8221f..c378255 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -226,6 +226,9 @@ Release 2.8.0 - UNRELEASED YARN-3533. Test: Fix launchAM in MockRM to wait for attempt to be scheduled. (Anubhav Dhoot via jianhe) + YARN-3564. Fix TestContainerAllocation.testAMContainerAllocationWhenDNSUnavailable + fails randomly. (Jian He via wangda) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/100b41ad/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java index 6aceda5..0ea993f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java @@ -325,7 +325,6 @@ public class TestContainerAllocation { } SecurityUtilTestHelper.setTokenServiceUseIp(false); - rm1.waitForState(attempt.getAppAttemptId(), RMAppAttemptState.ALLOCATED); MockRM.launchAndRegisterAM(app1, rm1, nm1); } }
