Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -140,18 +140,18 @@ public void handle(SCMCommand<?> command, OzoneContainer ozoneContainer,
// well. It is a no-op for XceiverServerSpi implementations (e.g. XceiverServerGrpc)
server.removeGroup(pipelineIdProto);
LOG.info("Close Pipeline {} command on datanode {}.", pipelineID,
dn.getUuidString());
dn);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's put on single line.

          LOG.info("Close Pipeline {} command on datanode {}.", pipelineID, dn);

} else {
LOG.debug("Ignoring close pipeline command for pipeline {} on datanode {} " +
"as it does not exist", pipelineID, dn.getUuidString());
"as it does not exist", pipelineID, dn);
}
} catch (IOException e) {
Throwable gme = HddsClientUtils.containsException(e, GroupMismatchException.class);
if (gme != null) {
// ignore silently since this means that the group has been closed by earlier close pipeline
// command in another datanode
LOG.debug("The group for pipeline {} on datanode {} has been removed by earlier close " +
"pipeline command handled in another datanode", pipelineID, dn.getUuidString());
"pipeline command handled in another datanode", pipelineID, dn);
} else {
LOG.error("Can't close pipeline {}", pipelineID, e);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public void onMessage(DatanodeDetails datanodeDetails,
"containers.",
pipelineID, pipeline.getPipelineState(),
HddsProtos.NodeState.HEALTHY_READONLY,
datanodeDetails.getUuidString());
datanodeDetails);
pipelineManager.closePipeline(pipelineID);
} catch (IOException ex) {
LOG.error("Failed to close pipeline {} which uses HEALTHY READONLY " +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private void processPipelineAction(final DatanodeDetails datanode,
final PipelineID pid = PipelineID.getFromProtobuf(info.getPipelineID());

final String logMsg = "Received pipeline action " + action + " for " + pid +
" from datanode " + datanode.getUuidString() + "." +
" from datanode " + datanode + "." +
" Reason : " + info.getDetailedReason();

// We can skip processing Pipeline Action if the current SCM is not leader.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ public void closeStalePipelines(DatanodeDetails datanodeDetails) {
getStalePipelines(datanodeDetails);
if (pipelinesWithStaleIpOrHostname.isEmpty()) {
LOG.debug("No stale pipelines for datanode {}",
datanodeDetails.getUuidString());
datanodeDetails);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's put on one line.

return;
}
LOG.info("Found {} stale pipelines",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public synchronized Pipeline create(RatisReplicationConfig replicationConfig,

dns.forEach(node -> {
LOG.info("Sending CreatePipelineCommand for pipeline:{} to datanode:{}",
pipeline.getId(), node.getUuidString());
pipeline.getId(), node);
eventPublisher.fireEvent(SCMEvents.DATANODE_COMMAND,
new CommandForDatanode<>(node.getUuid(), createCommand));
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ private Boolean injectDataNodeFailureDuringSCMUpgrade() {
new ArrayList<>(cluster.getHddsDatanodes());
for (HddsDatanodeService ds: currentDataNodes) {
DatanodeDetails dn = ds.getDatanodeDetails();
LOG.info("Restarting datanode {}", dn.getUuidString());
LOG.info("Restarting datanode {}", dn);
cluster.restartHddsDatanode(dn, false);
}
cluster.waitForClusterToBeReady();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void onMessage(DatanodeDetails datanodeDetails,
nodeManager.addNodeToDB(datanodeDetails);
} catch (IOException e) {
LOG.error("Unable to add new node {} to Node DB.",
datanodeDetails.getUuidString());
datanodeDetails);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's put on one line.

}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ private boolean startDatanode(DatanodeSimulationState dn)
throws IOException {
if (!registerDataNode(dn)) {
LOGGER.info("Failed to register datanode to SCM: {}",
dn.getDatanodeDetails().getUuidString());
dn.getDatanodeDetails());
return false;
}

Expand All @@ -359,7 +359,7 @@ private boolean startDatanode(DatanodeSimulationState dn)
reconHeartbeatInterval, TimeUnit.MILLISECONDS);

LOGGER.info("Successfully registered datanode to SCM: {}",
dn.getDatanodeDetails().getUuidString());
dn.getDatanodeDetails());
return true;
}

Expand Down Expand Up @@ -418,7 +418,7 @@ private void heartbeat(InetSocketAddress endpoint,
}
} catch (Exception e) {
LOGGER.info("Error sending heartbeat for {}: {}",
dn.getDatanodeDetails().getUuidString(), e.getMessage(), e);
dn.getDatanodeDetails(), e.getMessage(), e);
}
}

Expand Down