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

HDFS-16378. Add datanode address to BlockReportLeaseManager logs (#3786). Contributed by tomscut. 

Signed-off-by: He Xiaoqiao <hexiaoqiao@apache.org>
This commit is contained in:
litao 2021-12-15 11:16:32 +08:00 committed by GitHub
parent 843f66f4dc
commit 59c650802d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockReportLeaseManager.java
View File

@ -190,8 +190,8 @@ class BlockReportLeaseManager {
private synchronized NodeData registerNode(DatanodeDescriptor dn) {
if (nodes.containsKey(dn.getDatanodeUuid())) {
LOG.info("Can't register DN {} because it is already registered.",
dn.getDatanodeUuid());
LOG.info("Can't register DN {} ({}) because it is already registered.",
dn.getDatanodeUuid(), dn.getXferAddr());
return null;
}
NodeData node = new NodeData(dn.getDatanodeUuid());
@ -213,8 +213,8 @@ class BlockReportLeaseManager {
public synchronized void unregister(DatanodeDescriptor dn) {
NodeData node = nodes.remove(dn.getDatanodeUuid());
if (node == null) {
LOG.info("Can't unregister DN {} because it is not currently " +
"registered.", dn.getDatanodeUuid());
LOG.info("Can't unregister DN {} ({}) because it is not currently " +
"registered.", dn.getDatanodeUuid(), dn.getXferAddr());
return;
}
remove(node);
@ -224,7 +224,7 @@ class BlockReportLeaseManager {
NodeData node = nodes.get(dn.getDatanodeUuid());
if (node == null) {
LOG.warn("DN {} ({}) requested a lease even though it wasn't yet " +
"registered. Registering now.", dn.getDatanodeUuid(),
"registered. Registering now.", dn.getDatanodeUuid(),
dn.getXferAddr());
node = registerNode(dn);
}
@ -232,9 +232,9 @@ class BlockReportLeaseManager {
// The DataNode wants a new lease, even though it already has one.
// This can happen if the DataNode is restarted in between requesting
// a lease and using it.
LOG.debug("Removing existing BR lease 0x{} for DN {} in order to " +
LOG.debug("Removing existing BR lease 0x{} for DN {} ({}) in order to " +
"issue a new one.", Long.toHexString(node.leaseId),
dn.getDatanodeUuid());
dn.getDatanodeUuid(), dn.getXferAddr());
}
remove(node);
long monotonicNowMs = Time.monotonicNow();
@ -248,9 +248,9 @@ class BlockReportLeaseManager {
allLeases.append(prefix).append(cur.datanodeUuid);
prefix = ", ";
}
LOG.debug("Can't create a new BR lease for DN {}, because " +
"numPending equals maxPending at {}. Current leases: {}",
dn.getDatanodeUuid(), numPending, allLeases.toString());
LOG.debug("Can't create a new BR lease for DN {} ({}), because " +
"numPending equals maxPending at {}. Current leases: {}",
dn.getDatanodeUuid(), dn.getXferAddr(), numPending, allLeases);
}
return 0;
}
@ -259,8 +259,8 @@ class BlockReportLeaseManager {
node.leaseTimeMs = monotonicNowMs;
pendingHead.addToEnd(node);
if (LOG.isDebugEnabled()) {
LOG.debug("Created a new BR lease 0x{} for DN {}. numPending = {}",
Long.toHexString(node.leaseId), dn.getDatanodeUuid(), numPending);
LOG.debug("Created a new BR lease 0x{} for DN {} ({}). numPending = {}",
Long.toHexString(node.leaseId), dn.getDatanodeUuid(), dn.getXferAddr(), numPending);
}
return node.leaseId;
}
@ -293,36 +293,36 @@ class BlockReportLeaseManager {
public synchronized boolean checkLease(DatanodeDescriptor dn,
long monotonicNowMs, long id) {
if (id == 0) {
LOG.debug("Datanode {} is using BR lease id 0x0 to bypass " +
"rate-limiting.", dn.getDatanodeUuid());
LOG.debug("Datanode {} ({}) is using BR lease id 0x0 to bypass " +
"rate-limiting.", dn.getDatanodeUuid(), dn.getXferAddr());
return true;
}
NodeData node = nodes.get(dn.getDatanodeUuid());
if (node == null) {
LOG.info("BR lease 0x{} is not valid for unknown datanode {}",
Long.toHexString(id), dn.getDatanodeUuid());
LOG.info("BR lease 0x{} is not valid for unknown datanode {} ({})",
Long.toHexString(id), dn.getDatanodeUuid(), dn.getXferAddr());
return false;
}
if (node.leaseId == 0) {
LOG.warn("BR lease 0x{} is not valid for DN {}, because the DN " +
LOG.warn("BR lease 0x{} is not valid for DN {} ({}), because the DN " +
"is not in the pending set.",
Long.toHexString(id), dn.getDatanodeUuid());
Long.toHexString(id), dn.getDatanodeUuid(), dn.getXferAddr());
return false;
}
if (pruneIfExpired(monotonicNowMs, node)) {
LOG.warn("BR lease 0x{} is not valid for DN {}, because the lease " +
"has expired.", Long.toHexString(id), dn.getDatanodeUuid());
LOG.warn("BR lease 0x{} is not valid for DN {} ({}), because the lease " +
"has expired.", Long.toHexString(id), dn.getDatanodeUuid(), dn.getXferAddr());
return false;
}
if (id != node.leaseId) {
LOG.warn("BR lease 0x{} is not valid for DN {}. Expected BR lease 0x{}.",
Long.toHexString(id), dn.getDatanodeUuid(),
LOG.warn("BR lease 0x{} is not valid for DN {} ({}). Expected BR lease 0x{}.",
Long.toHexString(id), dn.getDatanodeUuid(), dn.getXferAddr(),
Long.toHexString(node.leaseId));
return false;
}
if (LOG.isTraceEnabled()) {
LOG.trace("BR lease 0x{} is valid for DN {}.",
Long.toHexString(id), dn.getDatanodeUuid());
LOG.trace("BR lease 0x{} is valid for DN {} ({}).",
Long.toHexString(id), dn.getDatanodeUuid(), dn.getXferAddr());
}
return true;
}
@ -330,20 +330,20 @@ class BlockReportLeaseManager {
public synchronized long removeLease(DatanodeDescriptor dn) {
NodeData node = nodes.get(dn.getDatanodeUuid());
if (node == null) {
LOG.info("Can't remove lease for unknown datanode {}",
dn.getDatanodeUuid());
LOG.info("Can't remove lease for unknown datanode {} ({})",
dn.getDatanodeUuid(), dn.getXferAddr());
return 0;
}
long id = node.leaseId;
if (id == 0) {
LOG.debug("DN {} has no lease to remove.", dn.getDatanodeUuid());
LOG.debug("DN {} ({}) has no lease to remove.", dn.getDatanodeUuid(), dn.getXferAddr());
return 0;
}
remove(node);
deferredHead.addToEnd(node);
if (LOG.isTraceEnabled()) {
LOG.trace("Removed BR lease 0x{} for DN {}. numPending = {}",
Long.toHexString(id), dn.getDatanodeUuid(), numPending);
LOG.trace("Removed BR lease 0x{} for DN {} ({}). numPending = {}",
Long.toHexString(id), dn.getDatanodeUuid(), dn.getXferAddr(), numPending);
}
return id;
}