From 4bebc505a591cd93fbb7b6588169414a6507ae51 Mon Sep 17 00:00:00 2001 From: Eli Collins Date: Mon, 2 Apr 2012 01:45:43 +0000 Subject: [PATCH] HDFS-3174. svn merge -c 1308226 from trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308227 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../server/blockmanagement/TestPendingDataNodeMessages.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 05453694bfc..acdb14aae60 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -288,6 +288,8 @@ Release 2.0.0 - UNRELEASED HDFS-2995. start-dfs.sh should only start the 2NN for namenodes with dfs.namenode.secondary.http-address configured. (eli) + HDFS-3174. Fix assert in TestPendingDataNodeMessages. (eli) + BREAKDOWN OF HDFS-1623 SUBTASKS HDFS-2179. Add fencing framework and mechanisms for NameNode HA. (todd) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingDataNodeMessages.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingDataNodeMessages.java index c84c8d1d03f..f73245860af 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingDataNodeMessages.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingDataNodeMessages.java @@ -56,8 +56,8 @@ public class TestPendingDataNodeMessages { Queue q = msgs.takeBlockQueue(block1Gs2DifferentInstance); 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)); assertEquals(0, msgs.count());