adoroszlai commented on code in PR #7495:
URL: https://github.com/apache/ozone/pull/7495#discussion_r1912388801
##########
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ContainerUtils.java:
##########
@@ -174,20 +174,25 @@ public static synchronized DatanodeDetails
readDatanodeDetailsFrom(File path)
if (!path.exists()) {
throw new IOException("Datanode ID file not found.");
}
+ DatanodeDetails datanodeDetails;
try {
- return DatanodeIdYaml.readDatanodeIdFile(path);
+ datanodeDetails = DatanodeIdYaml.readDatanodeIdFile(path);
} catch (IOException e) {
LOG.warn("Error loading DatanodeDetails yaml from {}",
path.getAbsolutePath(), e);
// Try to load as protobuf before giving up
try (FileInputStream in = new FileInputStream(path)) {
- return DatanodeDetails.getFromProtoBuf(
+ datanodeDetails = DatanodeDetails.getFromProtoBuf(
HddsProtos.DatanodeDetailsProto.parseFrom(in));
} catch (IOException io) {
throw new IOException("Failed to parse DatanodeDetails from "
+ path.getAbsolutePath(), io);
}
}
+
+ datanodeDetails.validateDatanodeIpAddress();
Review Comment:
Sorry if it was not clear from the previous
[comment](https://github.com/apache/ozone/pull/7495#discussion_r1905009590),
but IP validation shouldn't be called when reading the file, rather:
https://github.com/apache/ozone/blob/0e5e5b7bcfa65795b7c60828de6146b727a3e363/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java#L227-L232
BTW, looking at this existing initialization logic, I wonder if the new IP
validation logic is still needed. If it is, then it must be called after
setting both hostname and IP, otherwise these would overwrite the values from
`validateDatanodeIpAddress()`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
