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

HDFS-16375. The FBR lease ID should be exposed to the log (#3769)

This commit is contained in:
litao 2021-12-16 12:29:32 +08:00 committed by GitHub
parent 6ea1685abd
commit 10cdde59b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2741,6 +2741,8 @@ public class BlockManager implements BlockStatsMXBean {
Collection<Block> invalidatedBlocks = Collections.emptyList(); Collection<Block> invalidatedBlocks = Collections.emptyList();
String strBlockReportId = String strBlockReportId =
context != null ? Long.toHexString(context.getReportId()) : ""; context != null ? Long.toHexString(context.getReportId()) : "";
String fullBrLeaseId =
context != null ? Long.toHexString(context.getLeaseId()) : "";
try { try {
node = datanodeManager.getDatanode(nodeID); node = datanodeManager.getDatanode(nodeID);
@ -2763,10 +2765,10 @@ public class BlockManager implements BlockStatsMXBean {
if (namesystem.isInStartupSafeMode() if (namesystem.isInStartupSafeMode()
&& !StorageType.PROVIDED.equals(storageInfo.getStorageType()) && !StorageType.PROVIDED.equals(storageInfo.getStorageType())
&& storageInfo.getBlockReportCount() > 0) { && storageInfo.getBlockReportCount() > 0) {
blockLog.info("BLOCK* processReport 0x{}: " blockLog.info("BLOCK* processReport 0x{} with lease ID 0x{}: "
+ "discarded non-initial block report from {}" + "discarded non-initial block report from {}"
+ " because namenode still in startup phase", + " because namenode still in startup phase",
strBlockReportId, nodeID); strBlockReportId, fullBrLeaseId, nodeID);
blockReportLeaseManager.removeLease(node); blockReportLeaseManager.removeLease(node);
return !node.hasStaleStorages(); return !node.hasStaleStorages();
} }
@ -2774,9 +2776,9 @@ public class BlockManager implements BlockStatsMXBean {
if (storageInfo.getBlockReportCount() == 0) { if (storageInfo.getBlockReportCount() == 0) {
// The first block report can be processed a lot more efficiently than // The first block report can be processed a lot more efficiently than
// ordinary block reports. This shortens restart times. // ordinary block reports. This shortens restart times.
blockLog.info("BLOCK* processReport 0x{}: Processing first " blockLog.info("BLOCK* processReport 0x{} with lease ID 0x{}: Processing first "
+ "storage report for {} from datanode {}", + "storage report for {} from datanode {}",
strBlockReportId, strBlockReportId, fullBrLeaseId,
storageInfo.getStorageID(), storageInfo.getStorageID(),
nodeID); nodeID);
processFirstBlockReport(storageInfo, newReport); processFirstBlockReport(storageInfo, newReport);
@ -2795,8 +2797,8 @@ public class BlockManager implements BlockStatsMXBean {
if(blockLog.isDebugEnabled()) { if(blockLog.isDebugEnabled()) {
for (Block b : invalidatedBlocks) { for (Block b : invalidatedBlocks) {
blockLog.debug("BLOCK* processReport 0x{}: {} on node {} size {} " + blockLog.debug("BLOCK* processReport 0x{} with lease ID 0x{}: {} on node {} size {} " +
"does not belong to any file.", strBlockReportId, b, "does not belong to any file.", strBlockReportId, fullBrLeaseId, b,
node, b.getNumBytes()); node, b.getNumBytes());
} }
} }
@ -2806,9 +2808,9 @@ public class BlockManager implements BlockStatsMXBean {
if (metrics != null) { if (metrics != null) {
metrics.addStorageBlockReport((int) (endTime - startTime)); metrics.addStorageBlockReport((int) (endTime - startTime));
} }
blockLog.info("BLOCK* processReport 0x{}: from storage {} node {}, " + blockLog.info("BLOCK* processReport 0x{} with lease ID 0x{}: from storage {} node {}, " +
"blocks: {}, hasStaleStorage: {}, processing time: {} msecs, " + "blocks: {}, hasStaleStorage: {}, processing time: {} msecs, " +
"invalidatedBlocks: {}", strBlockReportId, storage.getStorageID(), "invalidatedBlocks: {}", strBlockReportId, fullBrLeaseId, storage.getStorageID(),
nodeID, newReport.getNumberOfBlocks(), nodeID, newReport.getNumberOfBlocks(),
node.hasStaleStorages(), (endTime - startTime), node.hasStaleStorages(), (endTime - startTime),
invalidatedBlocks.size()); invalidatedBlocks.size());

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
View File

@ -455,8 +455,8 @@ class BPServiceActor implements Runnable {
dn.getMetrics().addBlockReport(brSendCost, getRpcMetricSuffix()); dn.getMetrics().addBlockReport(brSendCost, getRpcMetricSuffix());
final int nCmds = cmds.size(); final int nCmds = cmds.size();
LOG.info((success ? "S" : "Uns") + LOG.info((success ? "S" : "Uns") +
"uccessfully sent block report 0x" + "uccessfully sent block report 0x" + Long.toHexString(reportId) +
Long.toHexString(reportId) + " to namenode: " + nnAddr + " with lease ID 0x" + Long.toHexString(fullBrLeaseId) + " to namenode: " + nnAddr +
", containing " + reports.length + ", containing " + reports.length +
" storage report(s), of which we sent " + numReportsSent + "." + " storage report(s), of which we sent " + numReportsSent + "." +
" The reports had " + totalBlockCount + " The reports had " + totalBlockCount +