Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Eli Collins 2012-04-02 01:45:43 +00:00
parent 0a73d4cb96
commit 4bebc505a5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -288,6 +288,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)

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingDataNodeMessages.java
View File

@ -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_1, dn=fake:100, reportedState=FINALIZED]," +
"ReportedBlockInfo [block=blk_1_2, dn=fake, 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());