HDFS-16833. NameNode should log internal EC blocks instead of the EC block group when it receives block reports. (#5106)
Reviewed-by: Tao Li <tomscut@apache.org>
This commit is contained in:
parent
5d6ab15860
commit
660530205e
@ -3616,7 +3616,7 @@ private Block addStoredBlock(final BlockInfo block,
|
||||
if (storedBlock == null || storedBlock.isDeleted()) {
|
||||
// If this block does not belong to anyfile, then we are done.
|
||||
blockLog.debug("BLOCK* addStoredBlock: {} on {} size {} but it does not belong to any file",
|
||||
block, node, block.getNumBytes());
|
||||
reportedBlock, node, reportedBlock.getNumBytes());
|
||||
// we could add this block to invalidate set of this datanode.
|
||||
// it will happen in next block report otherwise.
|
||||
return block;
|
||||
@ -3631,12 +3631,12 @@ private Block addStoredBlock(final BlockInfo block,
|
||||
(node.isDecommissioned() || node.isDecommissionInProgress()) ? 0 : 1;
|
||||
if (logEveryBlock) {
|
||||
blockLog.info("BLOCK* addStoredBlock: {} is added to {} (size={})",
|
||||
node, storedBlock, storedBlock.getNumBytes());
|
||||
node, reportedBlock, reportedBlock.getNumBytes());
|
||||
}
|
||||
} else if (result == AddBlockResult.REPLACED) {
|
||||
curReplicaDelta = 0;
|
||||
blockLog.warn("BLOCK* addStoredBlock: block {} moved to storageType " +
|
||||
"{} on node {}", storedBlock, storageInfo.getStorageType(), node);
|
||||
"{} on node {}", reportedBlock, storageInfo.getStorageType(), node);
|
||||
} else {
|
||||
// if the same block is added again and the replica was corrupt
|
||||
// previously because of a wrong gen stamp, remove it from the
|
||||
@ -3646,8 +3646,8 @@ private Block addStoredBlock(final BlockInfo block,
|
||||
curReplicaDelta = 0;
|
||||
if (blockLog.isDebugEnabled()) {
|
||||
blockLog.debug("BLOCK* addStoredBlock: Redundant addStoredBlock request"
|
||||
+ " received for {} on node {} size {}", storedBlock, node,
|
||||
storedBlock.getNumBytes());
|
||||
+ " received for {} on node {} size {}", reportedBlock, node,
|
||||
reportedBlock.getNumBytes());
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user