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

MAPREDUCE-4095. TestJobInProgress#testLocality uses a bogus topology. Contributed by Colin Patrick McCabe 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1308519 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-04-02 20:04:31 +00:00
parent 3a8d123ccb
commit 354025b6e7
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,6 +195,9 @@ Release 2.0.0 - UNRELEASED
MAPREDUCE-4091. tools testcases failing because of MAPREDUCE-4082 (tucu) MAPREDUCE-4091. tools testcases failing because of MAPREDUCE-4082 (tucu)
MAPREDUCE-4095. TestJobInProgress#testLocality uses a bogus topology.
(Colin Patrick McCabe via eli)
Release 0.23.3 - UNRELEASED Release 0.23.3 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

8
hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgress.java
View File

@ -354,13 +354,9 @@ public class TestJobInProgress {
Node r2n3 = new NodeBase("/default/rack2/node3"); Node r2n3 = new NodeBase("/default/rack2/node3");
nt.add(r2n3); nt.add(r2n3);
Node r2n4 = new NodeBase("/default/rack2/s1/node4");
nt.add(r2n4);
LOG.debug("r1n1 parent: " + r1n1.getParent() + "\n" + LOG.debug("r1n1 parent: " + r1n1.getParent() + "\n" +
"r1n2 parent: " + r1n2.getParent() + "\n" + "r1n2 parent: " + r1n2.getParent() + "\n" +
"r2n3 parent: " + r2n3.getParent() + "\n" + "r2n3 parent: " + r2n3.getParent());
"r2n4 parent: " + r2n4.getParent());
// Same host // Same host
assertEquals(0, JobInProgress.getMatchingLevelForNodes(r1n1, r1n1, 3)); assertEquals(0, JobInProgress.getMatchingLevelForNodes(r1n1, r1n1, 3));
@ -368,8 +364,6 @@ public class TestJobInProgress {
assertEquals(1, JobInProgress.getMatchingLevelForNodes(r1n1, r1n2, 3)); assertEquals(1, JobInProgress.getMatchingLevelForNodes(r1n1, r1n2, 3));
// Different rack // Different rack
assertEquals(2, JobInProgress.getMatchingLevelForNodes(r1n1, r2n3, 3)); assertEquals(2, JobInProgress.getMatchingLevelForNodes(r1n1, r2n3, 3));
// Different rack at different depth
assertEquals(3, JobInProgress.getMatchingLevelForNodes(r1n1, r2n4, 3));
} }
} }