You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by da...@apache.org on 2012/08/14 18:12:40 UTC
svn commit: r1372956 - in
/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs:
CHANGES.txt src/test/java/org/apache/hadoop/net/TestNetworkTopology.java
Author: daryn
Date: Tue Aug 14 16:12:39 2012
New Revision: 1372956
URL: http://svn.apache.org/viewvc?rev=1372956&view=rev
Log:
svn merge -c 1330613 FIXES: HDFS-3258. Test for HADOOP-8144 (pseudoSortByDistance in NetworkTopology for first rack local node). Contributed by Junping Du
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/net/TestNetworkTopology.java
Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1372956&r1=1372955&r2=1372956&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Tue Aug 14 16:12:39 2012
@@ -12,6 +12,9 @@ Release 0.23.3 - UNRELEASED
HDFS-3516. Check content-type in WebHdfsFileSystem. (szetszwo)
+ HDFS-3258. Test for HADOOP-8144 (pseudoSortByDistance in
+ NetworkTopology for first rack local node). (Junping Du via eli)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/net/TestNetworkTopology.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/net/TestNetworkTopology.java?rev=1372956&r1=1372955&r2=1372956&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/net/TestNetworkTopology.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/net/TestNetworkTopology.java Tue Aug 14 16:12:39 2012
@@ -104,6 +104,17 @@ public class TestNetworkTopology extends
assertTrue(testNodes[0] == dataNodes[1]);
assertTrue(testNodes[1] == dataNodes[3]);
assertTrue(testNodes[2] == dataNodes[5]);
+
+ // array contains local rack node which happens to be in position 0
+ testNodes[0] = dataNodes[1];
+ testNodes[1] = dataNodes[5];
+ testNodes[2] = dataNodes[3];
+ cluster.pseudoSortByDistance(dataNodes[0], testNodes );
+ // peudoSortByDistance does not take the "data center" layer into consideration
+ // and it doesn't sort by getDistance, so 1, 5, 3 is also valid here
+ assertTrue(testNodes[0] == dataNodes[1]);
+ assertTrue(testNodes[1] == dataNodes[5]);
+ assertTrue(testNodes[2] == dataNodes[3]);
}
public void testRemove() throws Exception {