HDFS-15873. Add namenode address in logs for block report (#2743)

(cherry picked from commit 6a922f98967ced0cbcf32d3acf6dfd10712e66a3)
(cherry picked from commit 2f56e2b54d0080cd22d3d8461567aa0364f983d8)
(cherry picked from commit 6df2dc8463c09239a97663d9c3b57d5bf873ee1b)
This commit is contained in:
litao 2021-03-09 00:50:51 +08:00 committed by Wei-Chiu Chuang
parent a5d584c684
commit 9cead46c63
No known key found for this signature in database
GPG Key ID: B362E1C021854B9D

View File

@ -423,7 +423,8 @@ List<DatanodeCommand> blockReport(long fullBrLeaseId) throws IOException {
final int nCmds = cmds.size();
LOG.info((success ? "S" : "Uns") +
"uccessfully sent block report 0x" +
Long.toHexString(reportId) + ", containing " + reports.length +
Long.toHexString(reportId) + " to namenode: " + nnAddr +
", containing " + reports.length +
" storage report(s), of which we sent " + numReportsSent + "." +
" The reports had " + totalBlockCount +
" total blocks and used " + numRPCs +
@ -932,10 +933,12 @@ void reRegister() throws IOException {
void triggerBlockReport(BlockReportOptions options) {
if (options.isIncremental()) {
LOG.info(bpos.toString() + ": scheduling an incremental block report.");
LOG.info(bpos.toString() + ": scheduling an incremental block report " +
"to namenode: " + nnAddr + ".");
ibrManager.triggerIBR(true);
} else {
LOG.info(bpos.toString() + ": scheduling a full block report.");
LOG.info(bpos.toString() + ": scheduling a full block report " +
"to namenode: " + nnAddr + ".");
synchronized(ibrManager) {
scheduler.forceFullBlockReportNow();
ibrManager.notifyAll();