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

HDFS-4583. Merged 1456052 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456055 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-03-13 17:34:07 +00:00
parent e81ffd1705
commit 1ed2234b3d
2 changed files with 3 additions and 1 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

@ -77,6 +77,8 @@ Release 2.0.5-beta - UNRELEASED
HDFS-4595. When short circuit read is fails, DFSClient does not fallback HDFS-4595. When short circuit read is fails, DFSClient does not fallback
to regular reads. (suresh) to regular reads. (suresh)
HDFS-4583. TestNodeCount fails. (Ivan Mitic via suresh)
Release 2.0.4-alpha - UNRELEASED Release 2.0.4-alpha - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestNodeCount.java
View File

@ -104,7 +104,7 @@ public class TestNodeCount {
while (iter.hasNext()) { while (iter.hasNext()) {
DatanodeDescriptor dn = iter.next(); DatanodeDescriptor dn = iter.next();
Collection<Block> blocks = bm.excessReplicateMap.get(dn.getStorageID()); Collection<Block> blocks = bm.excessReplicateMap.get(dn.getStorageID());
if (blocks == null || !blocks.contains(block) ) { if (blocks == null || !blocks.contains(block.getLocalBlock()) ) {
nonExcessDN = dn; nonExcessDN = dn;
break; break;
} }