adoroszlai commented on code in PR #7495:
URL: https://github.com/apache/ozone/pull/7495#discussion_r1914496914
##########
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:
@ptlrs The code excerpt (in my previous comment) from `HddsDatanodeService`
is executed during datanode startup. `initializeDatanodeDetails` will read
from file (for restart) or create from scratch (for first run). In both cases,
`HddsDatanodeService` unconditionally sets the hostname and IP address after
`initializeDatanodeDetails`.
Therefore, with `validateDatanodeIpAddress` called from
`readDatanodeDetailsFrom` called from `initializeDatanodeDetails`:
1. the host name being checked by `validateDatanodeIpAddress` may be out of
date
2. the IP address set by `validateDatanodeIpAddress` will be overwritten
--
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]
