Browse Source

HDFS-3174. Fix assert in TestPendingDataNodeMessages. Contributed by Eli Collins

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1308226 13f79535-47bb-0310-9956-ffa450edef68
Eli Collins 13 years ago
parent
commit
be8a0d1e62

+ 2 - 0
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -390,6 +390,8 @@ Release 2.0.0 - UNRELEASED
     HDFS-2995. start-dfs.sh should only start the 2NN for namenodes
     HDFS-2995. start-dfs.sh should only start the 2NN for namenodes
     with dfs.namenode.secondary.http-address configured. (eli)
     with dfs.namenode.secondary.http-address configured. (eli)
 
 
+    HDFS-3174. Fix assert in TestPendingDataNodeMessages. (eli)
+
   BREAKDOWN OF HDFS-1623 SUBTASKS
   BREAKDOWN OF HDFS-1623 SUBTASKS
 
 
     HDFS-2179. Add fencing framework and mechanisms for NameNode HA. (todd)
     HDFS-2179. Add fencing framework and mechanisms for NameNode HA. (todd)

+ 2 - 2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingDataNodeMessages.java

@@ -56,8 +56,8 @@ public class TestPendingDataNodeMessages {
     Queue<ReportedBlockInfo> q =
     Queue<ReportedBlockInfo> q =
       msgs.takeBlockQueue(block1Gs2DifferentInstance);
       msgs.takeBlockQueue(block1Gs2DifferentInstance);
     assertEquals(
     assertEquals(
-        "ReportedBlockInfo [block=blk_1_1, dn=fake, reportedState=FINALIZED]," +
-        "ReportedBlockInfo [block=blk_1_2, dn=fake, reportedState=FINALIZED]",
+        "ReportedBlockInfo [block=blk_1_1, dn=fake:100, reportedState=FINALIZED]," +
+        "ReportedBlockInfo [block=blk_1_2, dn=fake:100, reportedState=FINALIZED]",
         Joiner.on(",").join(q));
         Joiner.on(",").join(q));
     assertEquals(0, msgs.count());
     assertEquals(0, msgs.count());