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

HDFS-6053. Fix TestDecommissioningStatus and TestDecommission in branch-2. Contributed by Jing Zhao. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574178 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jing Zhao 2014-03-04 19:29:04 +00:00
parent f2d48add16
commit 45f24de631
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

@ -278,6 +278,9 @@ Release 2.4.0 - UNRELEASED
HDFS-6040. fix DFSClient issue without libhadoop.so and some other HDFS-6040. fix DFSClient issue without libhadoop.so and some other
ShortCircuitShm cleanups (cmccabe) ShortCircuitShm cleanups (cmccabe)
HDFS-6053. Fix TestDecommissioningStatus and TestDecommission in branch-2.
(jing9)
BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9) HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
View File

@ -2936,7 +2936,7 @@ assert storedBlock.findDatanode(dn) < 0 : "Block " + block
if (isNeededReplication(block, curExpectedReplicas, curReplicas)) { if (isNeededReplication(block, curExpectedReplicas, curReplicas)) {
if (curExpectedReplicas > curReplicas) { if (curExpectedReplicas > curReplicas) {
if (bc instanceof MutableBlockCollection) { if (bc.isUnderConstruction()) {
if (block.equals(bc.getLastBlock()) && curReplicas > minReplication) { if (block.equals(bc.getLastBlock()) && curReplicas > minReplication) {
continue; continue;
} }