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

HDFS-14808. EC: Improper size values for corrupt ec block in LOG. Contributed by Ayush Saxena.

This commit is contained in:
Ayush Saxena 2019-09-25 01:31:15 +05:30
parent eb96a3093e
commit 66400c1cbb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3159,23 +3159,26 @@ public class BlockManager implements BlockStatsMXBean {
+ storedBlock.getGenerationStamp(), Reason.GENSTAMP_MISMATCH); + storedBlock.getGenerationStamp(), Reason.GENSTAMP_MISMATCH);
} }
boolean wrongSize; boolean wrongSize;
long blockMapSize;
if (storedBlock.isStriped()) { if (storedBlock.isStriped()) {
assert BlockIdManager.isStripedBlockID(reported.getBlockId()); assert BlockIdManager.isStripedBlockID(reported.getBlockId());
assert storedBlock.getBlockId() == assert storedBlock.getBlockId() ==
BlockIdManager.convertToStripedID(reported.getBlockId()); BlockIdManager.convertToStripedID(reported.getBlockId());
BlockInfoStriped stripedBlock = (BlockInfoStriped) storedBlock; BlockInfoStriped stripedBlock = (BlockInfoStriped) storedBlock;
int reportedBlkIdx = BlockIdManager.getBlockIndex(reported); int reportedBlkIdx = BlockIdManager.getBlockIndex(reported);
wrongSize = reported.getNumBytes() != getInternalBlockLength( blockMapSize = getInternalBlockLength(stripedBlock.getNumBytes(),
stripedBlock.getNumBytes(), stripedBlock.getCellSize(), stripedBlock.getCellSize(), stripedBlock.getDataBlockNum(),
stripedBlock.getDataBlockNum(), reportedBlkIdx); reportedBlkIdx);
wrongSize = reported.getNumBytes() != blockMapSize;
} else { } else {
wrongSize = storedBlock.getNumBytes() != reported.getNumBytes(); blockMapSize = storedBlock.getNumBytes();
wrongSize = blockMapSize != reported.getNumBytes();
} }
if (wrongSize) { if (wrongSize) {
return new BlockToMarkCorrupt(new Block(reported), storedBlock, return new BlockToMarkCorrupt(new Block(reported), storedBlock,
"block is " + ucState + " and reported length " + "block is " + ucState + " and reported length " +
reported.getNumBytes() + " does not match " + reported.getNumBytes() + " does not match " +
"length in block map " + storedBlock.getNumBytes(), "length in block map " + blockMapSize,
Reason.SIZE_MISMATCH); Reason.SIZE_MISMATCH);
} else { } else {
return null; // not corrupt return null; // not corrupt