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

HDFS-7652. Process block reports for erasure coded blocks. Contributed by Zhe Zhang

Browse Source
This commit is contained in:
Zhe Zhang 2015-02-09 10:27:14 -08:00 committed by Zhe Zhang
parent bc2833b1c9
commit 0c1da5a030
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,4 +212,12 @@ public class BlockIdManager {
.LAST_RESERVED_BLOCK_ID); .LAST_RESERVED_BLOCK_ID);
generationStampV1Limit = HdfsConstants.GRANDFATHER_GENERATION_STAMP; generationStampV1Limit = HdfsConstants.GRANDFATHER_GENERATION_STAMP;
} }
public static boolean isStripedBlockID(long id) {
return id < 0;
}
public static long convertToGroupID(long id) {
return id & (~(HdfsConstants.MAX_BLOCKS_IN_GROUP - 1));
}
} }

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

@ -1943,7 +1943,7 @@ public class BlockManager {
break; break;
} }
BlockInfoContiguous bi = blocksMap.getStoredBlock(b); BlockInfoContiguous bi = getStoredBlock(b);
if (bi == null) { if (bi == null) {
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug("BLOCK* rescanPostponedMisreplicatedBlocks: " + LOG.debug("BLOCK* rescanPostponedMisreplicatedBlocks: " +
@ -2091,7 +2091,7 @@ public class BlockManager {
continue; continue;
} }
BlockInfoContiguous storedBlock = blocksMap.getStoredBlock(iblk); BlockInfoContiguous storedBlock = getStoredBlock(iblk);
// If block does not belong to any file, we are done. // If block does not belong to any file, we are done.
if (storedBlock == null) continue; if (storedBlock == null) continue;
@ -2231,7 +2231,7 @@ public class BlockManager {
} }
// find block by blockId // find block by blockId
BlockInfoContiguous storedBlock = blocksMap.getStoredBlock(block); BlockInfoContiguous storedBlock = getStoredBlock(block);
if(storedBlock == null) { if(storedBlock == null) {
// If blocksMap does not contain reported block id, // If blocksMap does not contain reported block id,
// the replica should be removed from the data-node. // the replica should be removed from the data-node.
@ -2529,7 +2529,7 @@ public class BlockManager {
DatanodeDescriptor node = storageInfo.getDatanodeDescriptor(); DatanodeDescriptor node = storageInfo.getDatanodeDescriptor();
if (block instanceof BlockInfoContiguousUnderConstruction) { if (block instanceof BlockInfoContiguousUnderConstruction) {
//refresh our copy in case the block got completed in another thread //refresh our copy in case the block got completed in another thread
storedBlock = blocksMap.getStoredBlock(block); storedBlock = getStoredBlock(block);
} else { } else {
storedBlock = block; storedBlock = block;
} }
@ -3410,7 +3410,15 @@ public class BlockManager {
} }
public BlockInfoContiguous getStoredBlock(Block block) { public BlockInfoContiguous getStoredBlock(Block block) {
return blocksMap.getStoredBlock(block); BlockInfoContiguous info = null;
if (BlockIdManager.isStripedBlockID(block.getBlockId())) {
info = blocksMap.getStoredBlock(
new Block(BlockIdManager.convertToGroupID(block.getBlockId())));
}
if (info == null) {
info = blocksMap.getStoredBlock(block);
}
return info;
} }
/** updates a block in under replication queue */ /** updates a block in under replication queue */