You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by el...@apache.org on 2012/04/02 22:04:31 UTC
svn commit: r1308519 - in /hadoop/common/trunk/hadoop-mapreduce-project:
CHANGES.txt src/test/mapred/org/apache/hadoop/mapred/TestJobInProgress.java
Author: eli
Date: Mon Apr 2 20:04:31 2012
New Revision: 1308519
URL: http://svn.apache.org/viewvc?rev=1308519&view=rev
Log:
MAPREDUCE-4095. TestJobInProgress#testLocality uses a bogus topology. Contributed by Colin Patrick McCabe
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgress.java
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1308519&r1=1308518&r2=1308519&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Mon Apr 2 20:04:31 2012
@@ -195,6 +195,9 @@ Release 2.0.0 - UNRELEASED
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
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgress.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgress.java?rev=1308519&r1=1308518&r2=1308519&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgress.java (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgress.java Mon Apr 2 20:04:31 2012
@@ -354,13 +354,9 @@ public class TestJobInProgress {
Node r2n3 = new NodeBase("/default/rack2/node3");
nt.add(r2n3);
- Node r2n4 = new NodeBase("/default/rack2/s1/node4");
- nt.add(r2n4);
-
LOG.debug("r1n1 parent: " + r1n1.getParent() + "\n" +
"r1n2 parent: " + r1n2.getParent() + "\n" +
- "r2n3 parent: " + r2n3.getParent() + "\n" +
- "r2n4 parent: " + r2n4.getParent());
+ "r2n3 parent: " + r2n3.getParent());
// Same host
assertEquals(0, JobInProgress.getMatchingLevelForNodes(r1n1, r1n1, 3));
@@ -368,8 +364,6 @@ public class TestJobInProgress {
assertEquals(1, JobInProgress.getMatchingLevelForNodes(r1n1, r1n2, 3));
// Different rack
assertEquals(2, JobInProgress.getMatchingLevelForNodes(r1n1, r2n3, 3));
- // Different rack at different depth
- assertEquals(3, JobInProgress.getMatchingLevelForNodes(r1n1, r2n4, 3));
}
}