Author: mattf
Date: Thu Nov 10 07:18:50 2011
New Revision: 1200201
URL: http://svn.apache.org/viewvc?rev=1200201&view=rev
Log:
HDFS-2346. TestHost2NodesMap & TestReplicasMap will fail depending upon
execution order of test methods. Contributed by Laxman and Uma Maheswara Rao.
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt (contents, props
changed)
hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/server/namenode/TestHost2NodesMap.java
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1200201&r1=1200200&r2=1200201&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Thu Nov 10 07:18:50
2011
@@ -92,6 +92,9 @@ Release 0.20.205.1 - unreleased
BUG FIXES
+ HDFS-2346. TestHost2NodesMap & TestReplicasMap will fail depending upon
+ execution order of test methods. (Laxman and Uma Maheswara Rao via Matt
Foley)
+
MAPREDUCE-3374. src/c++/task-controller/configure is not set executable in
the tarball and that prevents task-controller from rebuilding.
(Roman Shaposhnik via Matt Foley)
Propchange: hadoop/common/branches/branch-0.20-security/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 10 07:18:50 2011
@@ -2,7 +2,7 @@
/hadoop/common/branches/branch-0.20-append/CHANGES.txt:955380,955398,955448,956329
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1154413,1159730,1161741
-/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1170696,1171234,1171294,1174368,1176042,1176248,1176638,1176645,1200050,1200078
+/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1170696,1171234,1171294,1174368,1176042,1176248,1176638,1176645,1200050,1200078,1200199
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Modified:
hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/server/namenode/TestHost2NodesMap.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/server/namenode/TestHost2NodesMap.java?rev=1200201&r1=1200200&r2=1200201&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/server/namenode/TestHost2NodesMap.java
(original)
+++
hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/server/namenode/TestHost2NodesMap.java
Thu Nov 10 07:18:50 2011
@@ -18,29 +18,34 @@
package org.apache.hadoop.hdfs.server.namenode;
-import org.apache.hadoop.hdfs.protocol.DatanodeID;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import org.apache.hadoop.hdfs.protocol.DatanodeID;
+import org.junit.Before;
+import org.junit.Test;
-public class TestHost2NodesMap extends TestCase {
- static private Host2NodesMap map = new Host2NodesMap();
- private final static DatanodeDescriptor dataNodes[] = new
DatanodeDescriptor[] {
+public class TestHost2NodesMap {
+ private Host2NodesMap map = new Host2NodesMap();
+ private final DatanodeDescriptor dataNodes[] = new DatanodeDescriptor[] {
new DatanodeDescriptor(new DatanodeID("h1:5020"), "/d1/r1"),
new DatanodeDescriptor(new DatanodeID("h2:5020"), "/d1/r1"),
new DatanodeDescriptor(new DatanodeID("h3:5020"), "/d1/r2"),
new DatanodeDescriptor(new DatanodeID("h3:5030"), "/d1/r2"),
};
- private final static DatanodeDescriptor NULL_NODE = null;
- private final static DatanodeDescriptor NODE =
+ private final DatanodeDescriptor NULL_NODE = null;
+ private final DatanodeDescriptor NODE =
new DatanodeDescriptor(new DatanodeID("h3:5040"), "/d1/r4");
- static {
+ @Before
+ public void setup() {
for(DatanodeDescriptor node:dataNodes) {
map.add(node);
}
map.add(NULL_NODE);
}
+ @Test
public void testContains() throws Exception {
for(int i=0; i<dataNodes.length; i++) {
assertTrue(map.contains(dataNodes[i]));
@@ -49,6 +54,7 @@ public class TestHost2NodesMap extends T
assertFalse(map.contains(NODE));
}
+ @Test
public void testGetDatanodeByHost() throws Exception {
assertTrue(map.getDatanodeByHost("h1")==dataNodes[0]);
assertTrue(map.getDatanodeByHost("h2")==dataNodes[1]);
@@ -57,6 +63,7 @@ public class TestHost2NodesMap extends T
assertTrue(null==map.getDatanodeByHost("h4"));
}
+ @Test
public void testGetDatanodeByName() throws Exception {
assertTrue(map.getDatanodeByName("h1:5020")==dataNodes[0]);
assertTrue(map.getDatanodeByName("h1:5030")==null);
@@ -69,6 +76,7 @@ public class TestHost2NodesMap extends T
assertTrue(map.getDatanodeByName(null)==null);
}
+ @Test
public void testRemove() throws Exception {
assertFalse(map.remove(NODE));
