This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 225727d1890 HDDS-2821. Include datanode hostname/IP in logs in
addition to UUID (#11381)
225727d1890 is described below
commit 225727d1890f26d5ea4ff60b08c1d44fbdde14f9
Author: Neo Chien <[email protected]>
AuthorDate: Sat Oct 3 16:58:12 2026 +0800
HDDS-2821. Include datanode hostname/IP in logs in addition to UUID (#11381)
---
.../statemachine/commandhandler/ClosePipelineCommandHandler.java | 4 ++--
.../java/org/apache/hadoop/hdds/scm/block/DeletedBlockLogImpl.java | 2 +-
.../main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java | 2 +-
.../org/apache/hadoop/hdds/scm/node/PendingContainerTracker.java | 2 +-
.../main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java | 6 +++---
.../org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java | 2 +-
.../org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java | 2 +-
.../hadoop/hdds/scm/safemode/HealthyPipelineSafeModeRule.java | 6 +++---
.../org/apache/hadoop/ozone/recon/api/ClusterStateEndpoint.java | 2 +-
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/ClosePipelineCommandHandler.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/ClosePipelineCommandHandler.java
index 38924e9dcac..a279d4c4c31 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/ClosePipelineCommandHandler.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/ClosePipelineCommandHandler.java
@@ -153,10 +153,10 @@ public void handle(SCMCommand<?> command, OzoneContainer
ozoneContainer,
// command in another datanode
LOG.debug("Failed to remove group {} for pipeline {} on
peer {} since the group has " +
"been removed by earlier close pipeline command
handled in another datanode", raftGroupId,
- pipelineID, peer.getId());
+ pipelineID, peer);
} catch (IOException ioe) {
LOG.warn("Failed to remove group {} of pipeline {} on
peer {}",
- raftGroupId, pipelineID, peer.getId(), ioe);
+ raftGroupId, pipelineID, peer, ioe);
}
});
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLogImpl.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLogImpl.java
index d9282dc0517..8741c98aef4 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLogImpl.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLogImpl.java
@@ -530,7 +530,7 @@ public void onMessage(
metrics.incrDNCommandsFailure(dnId, 1);
} else {
LOG.debug("Delete Block Command {} is not executed on the Datanode" +
- " {}.", commandStatus.getCmdId(), dnId);
+ " {}.", commandStatus.getCmdId(), details);
}
getSCMDeletedBlockTransactionStatusManager()
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
index 208d40f8ed7..51df2cf7879 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
@@ -320,7 +320,7 @@ public void addNode(DatanodeDetails datanodeDetails,
updateLastKnownLayoutVersion(datanodeDetails, layoutInfo);
} catch (NodeNotFoundException ex) {
throw new IllegalStateException("Inconsistent NodeStateMap! Datanode "
- + datanodeDetails.getID() + " was added but not found in map: " +
nodeStateMap);
+ + datanodeDetails + " was added but not found in map: " +
nodeStateMap);
}
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/PendingContainerTracker.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/PendingContainerTracker.java
index eb17b3ccf86..33a14f5536d 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/PendingContainerTracker.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/PendingContainerTracker.java
@@ -273,7 +273,7 @@ public boolean hasAvailableSpace(DatanodeInfo datanodeInfo)
{
}
}
LOG.debug("Datanode {} has no available container slots. Pending: {},
Allocatable: {}",
- datanodeInfo.getID(), pendingCount, allocatableCount);
+ datanodeInfo, pendingCount, allocatableCount);
return false;
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
index 92111687361..6a891e09b5c 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
@@ -1561,7 +1561,7 @@ private boolean
hasEnoughCommittedVolumeSpace(DatanodeInfo dnInfo) {
}
}
LOG.debug("Datanode {} has no volumes with committed space >= {} bytes",
- dnInfo.getID(), blockSize);
+ dnInfo, blockSize);
return false;
}
}
@@ -1727,7 +1727,7 @@ public int pipelineLimit(DatanodeDetails dn) {
}
} catch (NodeNotFoundException e) {
LOG.warn("Cannot generate NodeStat, datanode {} not found.",
- dn.getID());
+ dn);
}
return 0;
}
@@ -1736,7 +1736,7 @@ private int getHealthyVolumeCount(DatanodeDetails dn) {
try {
return nodeStateManager.getNode(dn).getHealthyVolumeCount();
} catch (NodeNotFoundException e) {
- LOG.warn("Failed to getHealthyVolumeCount, datanode {} not found.",
dn.getID());
+ LOG.warn("Failed to getHealthyVolumeCount, datanode {} not found.", dn);
return 0;
}
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java
index c472e65b8b3..9d805084f85 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java
@@ -695,7 +695,7 @@ public boolean checkSpaceAndRecordAllocation(Pipeline
pipeline, ContainerID cont
// Refactored to use getNode instead of getDatanodeInfo
final DatanodeInfo info = nodeManager.getNode(dn.getID());
if (info == null) {
- LOG.warn("DatanodeInfo not found for {}", dn.getID());
+ LOG.warn("DatanodeInfo not found for {}", dn);
return false;
}
datanodeInfos.add(info);
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java
index 35512b2e4f3..31ba235f6cd 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java
@@ -279,7 +279,7 @@ public void close(Pipeline pipeline) throws
NotLeaderException {
final CommandForDatanode<?> datanodeCommand =
new CommandForDatanode<>(node, closeCommand);
LOG.info("Send pipeline:{} close command to datanode {}",
- pipeline.getId(), datanodeCommand.getDatanodeId());
+ pipeline.getId(), node);
eventPublisher.fireEvent(SCMEvents.DATANODE_COMMAND, datanodeCommand);
});
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/HealthyPipelineSafeModeRule.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/HealthyPipelineSafeModeRule.java
index d6c301c32c5..880e8f306bb 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/HealthyPipelineSafeModeRule.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/HealthyPipelineSafeModeRule.java
@@ -188,7 +188,7 @@ protected synchronized void process(Pipeline pipeline) {
if (!badDnsWithReasons.isEmpty()) {
String badDnSummary = badDnsWithReasons.entrySet().stream()
- .map(entry -> String.format("DN %s: %s", entry.getKey().getID(),
entry.getValue()))
+ .map(entry -> String.format("DN %s: %s", entry.getKey(),
entry.getValue()))
.collect(Collectors.joining("; "));
LOG.warn("Below DNs reported by Pipeline: {} are either in bad health or
un-registered with SCMs. Details: {}",
pipeline.getId(), badDnSummary);
@@ -289,12 +289,12 @@ boolean isPipelineHealthy(Pipeline pipeline) {
NodeStatus status = nodeManager.getNodeStatus(dn);
if (!status.equals(NodeStatus.inServiceHealthy())) {
LOG.debug("Pipeline {} is not healthy: DN {} has status - Health:
{}, Operational State: {}",
- pipeline.getId(), dn.getUuidString(), status.getHealth(),
status.getOperationalState());
+ pipeline.getId(), dn, status.getHealth(),
status.getOperationalState());
return false;
}
} catch (NodeNotFoundException e) {
LOG.warn("Pipeline {} is not healthy: DN {} not found in node manager",
- pipeline.getId(), dn.getUuidString());
+ pipeline.getId(), dn);
return false;
}
}
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ClusterStateEndpoint.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ClusterStateEndpoint.java
index 608c4846d38..b6e254b3550 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ClusterStateEndpoint.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ClusterStateEndpoint.java
@@ -139,7 +139,7 @@ public Response getClusterState() {
reportedNodes++;
} else {
LOG.debug("DataNode {} has not reported filesystem usage",
- datanode.getUuidString());
+ datanode);
}
}
if (reportedNodes < totalNodes) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
