siddhantsangwan commented on code in PR #7985:
URL: https://github.com/apache/ozone/pull/7985#discussion_r1975141027
##########
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/MismatchedReplicasHandler.java:
##########
@@ -57,35 +58,28 @@ public MismatchedReplicasHandler(
*/
@Override
public boolean handle(ContainerCheckRequest request) {
- ContainerInfo containerInfo = request.getContainerInfo();
- Set<ContainerReplica> replicas = request.getContainerReplicas();
+ if (request.isReadOnly()) {
+ return false;
+ }
+
+ final ContainerInfo containerInfo = request.getContainerInfo();
+ final Set<ContainerReplica> replicas = request.getContainerReplicas();
+
if (containerInfo.getState() != HddsProtos.LifeCycleState.CLOSED &&
containerInfo.getState() != HddsProtos.LifeCycleState.QUASI_CLOSED) {
// Handler is only relevant for CLOSED or QUASI-CLOSED containers.
return false;
}
- LOG.debug("Checking container {} in MismatchedReplicasHandler",
- containerInfo);
- if (request.isReadOnly()) {
- return false;
- }
- // close replica if needed
- for (ContainerReplica replica : replicas) {
- if (shouldBeClosed(containerInfo, replica)) {
- LOG.debug("Sending close command for mismatched replica {} of " +
- "container {}.", replica, containerInfo);
+ LOG.debug("Checking container {} in MismatchedReplicasHandler",
containerInfo);
- if (containerInfo.getState() == HddsProtos.LifeCycleState.CLOSED) {
- replicationManager.sendCloseContainerReplicaCommand(
- containerInfo, replica.getDatanodeDetails(), true);
- } else if (containerInfo.getState() ==
- HddsProtos.LifeCycleState.QUASI_CLOSED) {
- replicationManager.sendCloseContainerReplicaCommand(
- containerInfo, replica.getDatanodeDetails(), false);
- }
- }
- }
+ final Predicate<ContainerReplica> shouldSendClose = (r) ->
shouldSendClose(containerInfo, r);
+
+ replicas.stream().filter(shouldSendClose).forEach(r -> {
+ LOG.debug("Sending close command for mismatched replica {} of container
{}.", r, containerInfo);
+ replicationManager.sendCloseContainerReplicaCommand(
+ containerInfo, r.getDatanodeDetails(),
shouldForceClose(containerInfo, r));
Review Comment:
So just to be clear, we're also sending a force close if the replica is
open/closing and the bcsid matches. I think this is different from the previous
commit's behaviour.
--
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]
