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

HDFS-8167. BlockManager.addBlockCollectionWithCheck should check if the block is a striped block. Contributed by Hui Zheng.

Browse Source
This commit is contained in:
Zhe Zhang 2015-04-17 12:05:31 -07:00 committed by Zhe Zhang
parent 4c039b0876
commit 64f8f0a145
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-EC-7285.txt
View File

@ -85,3 +85,5 @@
HDFS-7994. Detect if resevered EC Block ID is already used during namenode HDFS-7994. Detect if resevered EC Block ID is already used during namenode
startup. (Hui Zheng via szetszwo) startup. (Hui Zheng via szetszwo)
HDFS-8167. BlockManager.addBlockCollectionWithCheck should check if the block is a striped block. (Hui Zheng via zhz).

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

@ -2946,15 +2946,6 @@ public boolean hasNonEcBlockUsingStripedID(){
return hasNonEcBlockUsingStripedID; return hasNonEcBlockUsingStripedID;
} }
/**
* Set the value of whether there are any non-EC blocks using StripedID.
*
* @param has - the value of whether there are any non-EC blocks using StripedID.
*/
public void hasNonEcBlockUsingStripedID(boolean has){
hasNonEcBlockUsingStripedID = has;
}
/** /**
* Process a single possibly misreplicated block. This adds it to the * Process a single possibly misreplicated block. This adds it to the
* appropriate queues if necessary, and returns a result code indicating * appropriate queues if necessary, and returns a result code indicating
@ -3562,7 +3553,7 @@ public BlockInfo getStoredBlock(Block block) {
if (BlockIdManager.isStripedBlockID(block.getBlockId())) { if (BlockIdManager.isStripedBlockID(block.getBlockId())) {
info = blocksMap.getStoredBlock( info = blocksMap.getStoredBlock(
new Block(BlockIdManager.convertToStripedID(block.getBlockId()))); new Block(BlockIdManager.convertToStripedID(block.getBlockId())));
if ((info == null) && hasNonEcBlockUsingStripedID()){ if ((info == null) && hasNonEcBlockUsingStripedID){
info = blocksMap.getStoredBlock(block); info = blocksMap.getStoredBlock(block);
} }
} else { } else {
@ -3746,10 +3737,9 @@ public BlockInfo addBlockCollection(BlockInfo block,
*/ */
public BlockInfo addBlockCollectionWithCheck( public BlockInfo addBlockCollectionWithCheck(
BlockInfo block, BlockCollection bc) { BlockInfo block, BlockCollection bc) {
if (!hasNonEcBlockUsingStripedID()){ if (!hasNonEcBlockUsingStripedID && !block.isStriped() &&
if (BlockIdManager.isStripedBlockID(block.getBlockId())) { BlockIdManager.isStripedBlockID(block.getBlockId())) {
hasNonEcBlockUsingStripedID(true); hasNonEcBlockUsingStripedID = true;
}
} }
return addBlockCollection(block, bc); return addBlockCollection(block, bc);
} }