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

HDFS-6364: Merging r1601771 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601772 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arpit Agarwal 2014-06-10 21:03:16 +00:00
parent 71028526c1
commit 705c23e718
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -342,6 +342,9 @@ Release 2.5.0 - UNRELEASED
HDFS-6257. TestCacheDirectives#testExceedsCapacity fails occasionally HDFS-6257. TestCacheDirectives#testExceedsCapacity fails occasionally
(cmccabe) (cmccabe)
HDFS-6364. Incorrect check for unknown datanode in Balancer. (Benoy
Antony via Arpit Agarwal)
Release 2.4.1 - UNRELEASED Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
View File

@ -696,7 +696,7 @@ public class Balancer {
// update locations // update locations
for (String datanodeUuid : blk.getDatanodeUuids()) { for (String datanodeUuid : blk.getDatanodeUuids()) {
final BalancerDatanode d = datanodeMap.get(datanodeUuid); final BalancerDatanode d = datanodeMap.get(datanodeUuid);
if (datanode != null) { // not an unknown datanode if (d != null) { // not an unknown datanode
block.addLocation(d); block.addLocation(d);
} }
} }