HDFS-12642. Log block and datanode details in BlockRecoveryWorker.

This commit is contained in:
Xiao Chen 2017-10-16 10:33:16 -07:00
parent 7bd700941d
commit 21bc855587

View File

@ -197,10 +197,9 @@ void syncBlock(List<BlockRecord> syncList) throws IOException {
long blockId = (isTruncateRecovery) ? long blockId = (isTruncateRecovery) ?
rBlock.getNewBlock().getBlockId() : block.getBlockId(); rBlock.getNewBlock().getBlockId() : block.getBlockId();
if (LOG.isDebugEnabled()) { LOG.info("BlockRecoveryWorker: block={} (length={}),"
LOG.debug("block=" + block + ", (length=" + block.getNumBytes() + " isTruncateRecovery={}, syncList={}", block,
+ "), syncList=" + syncList); block.getNumBytes(), isTruncateRecovery, syncList);
}
// syncList.isEmpty() means that all data-nodes do not have the block // syncList.isEmpty() means that all data-nodes do not have the block
// or their replicas have 0 length. // or their replicas have 0 length.
@ -289,6 +288,11 @@ void syncBlock(List<BlockRecord> syncList) throws IOException {
newBlock.setNumBytes(rBlock.getNewBlock().getNumBytes()); newBlock.setNumBytes(rBlock.getNewBlock().getNumBytes());
} }
LOG.info("BlockRecoveryWorker: block={} (length={}), bestState={},"
+ " newBlock={} (length={}), participatingList={}",
block, block.getNumBytes(), bestState.name(), newBlock,
newBlock.getNumBytes(), participatingList);
List<DatanodeID> failedList = new ArrayList<>(); List<DatanodeID> failedList = new ArrayList<>();
final List<BlockRecord> successList = new ArrayList<>(); final List<BlockRecord> successList = new ArrayList<>();
for (BlockRecord r : participatingList) { for (BlockRecord r : participatingList) {
@ -542,7 +546,7 @@ private static void logRecoverBlock(String who, RecoveringBlock rb) {
ExtendedBlock block = rb.getBlock(); ExtendedBlock block = rb.getBlock();
DatanodeInfo[] targets = rb.getLocations(); DatanodeInfo[] targets = rb.getLocations();
LOG.info(who + " calls recoverBlock(" + block LOG.info("BlockRecoveryWorker: " + who + " calls recoverBlock(" + block
+ ", targets=[" + Joiner.on(", ").join(targets) + "]" + ", targets=[" + Joiner.on(", ").join(targets) + "]"
+ ", newGenerationStamp=" + rb.getNewGenerationStamp() + ", newGenerationStamp=" + rb.getNewGenerationStamp()
+ ", newBlock=" + rb.getNewBlock() + ", newBlock=" + rb.getNewBlock()