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

YARN-1262. TestApplicationCleanup relies on all containers assigned in a single heartbeat (Karthik Kambatla via Sandy Ryza) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528243 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sanford Ryza 2013-10-01 22:42:50 +00:00
parent 85a1bd107a
commit 4b9fa6af9d
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,6 +114,9 @@ Release 2.1.2 - UNRELEASED
YARN-1215. Yarn URL should include userinfo. (Chuan Liu via cnauroth) YARN-1215. Yarn URL should include userinfo. (Chuan Liu via cnauroth)
YARN-1262. TestApplicationCleanup relies on all containers assigned in a
single heartbeat (Karthik Kambatla via Sandy Ryza)
Release 2.1.1-beta - 2013-09-23 Release 2.1.1-beta - 2013-09-23
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationCleanup.java
View File

@ -88,6 +88,7 @@ public class TestApplicationCleanup {
conts = am.allocate(new ArrayList<ResourceRequest>(), conts = am.allocate(new ArrayList<ResourceRequest>(),
new ArrayList<ContainerId>()).getAllocatedContainers(); new ArrayList<ContainerId>()).getAllocatedContainers();
contReceived += conts.size(); contReceived += conts.size();
nm1.nodeHeartbeat(true);
} }
Assert.assertEquals(request, contReceived); Assert.assertEquals(request, contReceived);
@ -178,6 +179,7 @@ public class TestApplicationCleanup {
new ArrayList<ContainerId>()).getAllocatedContainers(); new ArrayList<ContainerId>()).getAllocatedContainers();
dispatcher.await(); dispatcher.await();
contReceived += conts.size(); contReceived += conts.size();
nm1.nodeHeartbeat(true);
} }
Assert.assertEquals(request, contReceived); Assert.assertEquals(request, contReceived);