adoroszlai commented on code in PR #8990:
URL: https://github.com/apache/ozone/pull/8990#discussion_r2594618126
##########
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/states/ContainerEntry.java:
##########
@@ -31,7 +32,8 @@
*/
public class ContainerEntry {
private final ContainerInfo info;
- private final Map<DatanodeID, ContainerReplica> replicas = new HashMap<>();
+ private Map<DatanodeID, ContainerReplica> replicaMap =
Collections.emptyMap();
Review Comment:
We need to restore the `HashMap` since `replicas` is not reassigned:
```suggestion
private final Map<DatanodeID, ContainerReplica> replicas = new HashMap<>();
```
##########
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/states/ContainerEntry.java:
##########
@@ -42,14 +44,20 @@ public ContainerInfo getInfo() {
}
public Set<ContainerReplica> getReplicas() {
- return new HashSet<>(replicas.values());
+ return replicas;
}
public ContainerReplica put(ContainerReplica r) {
- return replicas.put(r.getDatanodeDetails().getID(), r);
+ return copyAndUpdate(map -> map.put(r.getDatanodeDetails().getID(), r));
}
public ContainerReplica removeReplica(DatanodeID datanodeID) {
- return replicas.remove(datanodeID);
+ return copyAndUpdate(map -> map.remove(datanodeID));
+ }
+
+ private <T> T copyAndUpdate(java.util.function.Function<Map<DatanodeID,
ContainerReplica>, T> update) {
Review Comment:
nit: please add import for `Function`
##########
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/states/ContainerEntry.java:
##########
@@ -42,14 +44,20 @@ public ContainerInfo getInfo() {
}
public Set<ContainerReplica> getReplicas() {
- return new HashSet<>(replicas.values());
+ return replicas;
}
public ContainerReplica put(ContainerReplica r) {
- return replicas.put(r.getDatanodeDetails().getID(), r);
+ return copyAndUpdate(map -> map.put(r.getDatanodeDetails().getID(), r));
}
public ContainerReplica removeReplica(DatanodeID datanodeID) {
- return replicas.remove(datanodeID);
+ return copyAndUpdate(map -> map.remove(datanodeID));
+ }
+
+ private <T> T copyAndUpdate(java.util.function.Function<Map<DatanodeID,
ContainerReplica>, T> update) {
+ T result = update.apply(this.replicaMap);
+ this.replicas = Collections.unmodifiableSet(new
HashSet<>(this.replicaMap.values()));
Review Comment:
nit: let's avoid `this.` like the rest of the class
```suggestion
T result = update.apply(replicaMap);
replicas = Collections.unmodifiableSet(new
HashSet<>(replicaMap.values()));
```
--
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]
