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

HDFS-9485. Make BlockManager#removeFromExcessReplicateMap accept BlockInfo instead of Block. Contributed by Mingliang Liu.

Browse Source
This commit is contained in:
Jing Zhao 2015-12-01 13:05:22 -08:00
parent 1cc7e61431
commit 830eb252aa
3 changed files with 6 additions and 3 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

@ -1704,6 +1704,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9269. Update the documentation and wrapper for fuse-dfs. HDFS-9269. Update the documentation and wrapper for fuse-dfs.
(Wei-Chiu Chuang via zhz) (Wei-Chiu Chuang via zhz)
HDFS-9485. Make BlockManager#removeFromExcessReplicateMap accept BlockInfo
instead of Block. (Mingliang Liu via jing9)
OPTIMIZATIONS OPTIMIZATIONS
HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than

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

@ -3930,7 +3930,7 @@ public class BlockManager implements BlockStatsMXBean {
return corruptReplicas.numCorruptReplicas(block); return corruptReplicas.numCorruptReplicas(block);
} }
public void removeBlockFromMap(Block block) { public void removeBlockFromMap(BlockInfo block) {
removeFromExcessReplicateMap(block); removeFromExcessReplicateMap(block);
blocksMap.removeBlock(block); blocksMap.removeBlock(block);
// If block is removed from blocksMap remove it from corruptReplicasMap // If block is removed from blocksMap remove it from corruptReplicasMap
@ -3940,7 +3940,7 @@ public class BlockManager implements BlockStatsMXBean {
/** /**
* If a block is removed from blocksMap, remove it from excessReplicateMap. * If a block is removed from blocksMap, remove it from excessReplicateMap.
*/ */
private void removeFromExcessReplicateMap(Block block) { private void removeFromExcessReplicateMap(BlockInfo block) {
for (DatanodeStorageInfo info : blocksMap.getStorages(block)) { for (DatanodeStorageInfo info : blocksMap.getStorages(block)) {
String uuid = info.getDatanodeDescriptor().getDatanodeUuid(); String uuid = info.getDatanodeDescriptor().getDatanodeUuid();
LightWeightHashSet<BlockInfo> excessReplicas = LightWeightHashSet<BlockInfo> excessReplicas =

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java
View File

@ -82,7 +82,7 @@ class FSDirWriteFileOp {
if (uc == null) { if (uc == null) {
return false; return false;
} }
fsd.getBlockManager().removeBlockFromMap(block); fsd.getBlockManager().removeBlockFromMap(uc);
if(NameNode.stateChangeLog.isDebugEnabled()) { if(NameNode.stateChangeLog.isDebugEnabled()) {
NameNode.stateChangeLog.debug("DIR* FSDirectory.removeBlock: " NameNode.stateChangeLog.debug("DIR* FSDirectory.removeBlock: "