big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-2729. Update BlockManager's comments regarding the invalid block set (harsh)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1225591 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Harsh J 2011-12-29 16:51:59 +00:00
parent 07027b80f3
commit 6c349f9420
2 changed files with 6 additions and 4 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

@ -119,6 +119,8 @@ Trunk (unreleased changes)
HDFS-2726. Fix a logging issue under DFSClient's createBlockOutputStream method (harsh)
HDFS-2729. Update BlockManager's comments regarding the invalid block set (harsh)
OPTIMIZATIONS
HDFS-2477. Optimize computing the diff between a block report and the
namenode state. (Tomasz Nykiel via hairong)

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

@ -1492,7 +1492,7 @@ private BlockInfo processReportedBlock(final DatanodeDescriptor dn,
// Ignore replicas already scheduled to be removed from the DN
if(invalidateBlocks.contains(dn.getStorageID(), block)) {
assert storedBlock.findDatanode(dn) < 0 : "Block " + block
+ " in recentInvalidatesSet should not appear in DN " + dn;
+ " in invalidated blocks set should not appear in DN " + dn;
return storedBlock;
}
@ -1720,7 +1720,7 @@ private Block addStoredBlock(final BlockInfo block,
* Invalidate corrupt replicas.
* <p>
* This will remove the replicas from the block's location list,
* add them to {@link #recentInvalidateSets} so that they could be further
* add them to {@link #invalidateBlocks} so that they could be further
* deleted from the respective data-nodes,
* and remove the block from corruptReplicasMap.
* <p>
@ -1949,7 +1949,7 @@ private void chooseExcessReplicates(Collection<DatanodeDescriptor> nonExcess,
//
addToInvalidates(b, cur);
NameNode.stateChangeLog.info("BLOCK* chooseExcessReplicates: "
+"("+cur.getName()+", "+b+") is added to recentInvalidateSets");
+"("+cur.getName()+", "+b+") is added to invalidated blocks set.");
}
}
@ -2365,7 +2365,7 @@ private int getReplication(Block block) {
/**
* Get blocks to invalidate for <i>nodeId</i>
* in {@link #recentInvalidateSets}.
* in {@link #invalidateBlocks}.
*
* @return number of blocks scheduled for removal during this iteration.
*/