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

Merge r1588343 from trunk: YARN-1750. TestNodeStatusUpdater#testNMRegistration is incorrect in test case. (Wangda Tan via junping_du) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588347 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Junping Du 2014-04-17 19:13:17 +00:00
parent d0db2c2b78
commit 8c23c3295a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,6 +120,9 @@ Release 2.4.1 - UNRELEASED
YARN-1931. Private API change in YARN-1824 in 2.4 broke compatibility YARN-1931. Private API change in YARN-1824 in 2.4 broke compatibility
with previous releases (Sandy Ryza via tgraves) with previous releases (Sandy Ryza via tgraves)
YARN-1750. TestNodeStatusUpdater#testNMRegistration is incorrect in test
case. (Wangda Tan via junping_du)
Release 2.4.0 - 2014-04-07 Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

8
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java
View File

@ -261,10 +261,12 @@ public class TestNodeStatusUpdater {
this.context.getContainers().put(secondContainerID, container); this.context.getContainers().put(secondContainerID, container);
} else if (heartBeatID == 3) { } else if (heartBeatID == 3) {
// Checks on the RM end // Checks on the RM end
Assert.assertEquals("Number of applications should only be one!", 1, Assert.assertEquals("Number of applications should have two!", 2,
appToContainers.size()); appToContainers.size());
Assert.assertEquals("Number of container for the app should be two!", Assert.assertEquals("Number of container for the app-1 should be only one!",
2, appToContainers.get(appId2).size()); 1, appToContainers.get(appId1).size());
Assert.assertEquals("Number of container for the app-2 should be only one!",
1, appToContainers.get(appId2).size());
// Checks on the NM end // Checks on the NM end
ConcurrentMap<ContainerId, Container> activeContainers = ConcurrentMap<ContainerId, Container> activeContainers =