hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1308520 - in /hadoop/common/branches/branch-1: CHANGES.txt src/test/org/apache/hadoop/mapred/TestJobInProgress.java
Date Mon, 02 Apr 2012 20:07:47 GMT
Author: eli
Date: Mon Apr  2 20:07:46 2012
New Revision: 1308520

URL: http://svn.apache.org/viewvc?rev=1308520&view=rev
Log:
MAPREDUCE-4095. TestJobInProgress#testLocality uses a bogus topology. Contributed by Colin
Patrick McCabe

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobInProgress.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1308520&r1=1308519&r2=1308520&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon Apr  2 20:07:46 2012
@@ -190,6 +190,9 @@ Release 1.1.0 - unreleased
     HDFS-3129. NetworkTopology: add test that getLeaf should check for
     invalid topologies. (Colin Patrick McCabe via eli)
 
+    MAPREDUCE-4095. TestJobInProgress#testLocality uses a bogus topology.
+    (Colin Patrick McCabe via eli)
+
 Release 1.0.3 - unreleased
 
   NEW FEATURES

Modified: hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobInProgress.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobInProgress.java?rev=1308520&r1=1308519&r2=1308520&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobInProgress.java
(original)
+++ hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobInProgress.java
Mon Apr  2 20:07:46 2012
@@ -228,13 +228,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));
@@ -242,8 +238,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));
   }
 
   @AfterClass



Mime
View raw message