siddhantsangwan commented on code in PR #3881: URL: https://github.com/apache/ozone/pull/3881#discussion_r1007074244
########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestDeletingContainerHandler.java: ########## @@ -0,0 +1,252 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hdds.scm.container.replication.health; + +import org.apache.hadoop.hdds.client.ECReplicationConfig; +import org.apache.hadoop.hdds.client.RatisReplicationConfig; +import org.apache.hadoop.hdds.client.ReplicationConfig; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.HddsProtos; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.ContainerReplicaProto; +import org.apache.hadoop.hdds.scm.container.ContainerID; +import org.apache.hadoop.hdds.scm.container.ContainerInfo; +import org.apache.hadoop.hdds.scm.container.ContainerReplica; +import org.apache.hadoop.hdds.scm.container.ReplicationManagerReport; +import org.apache.hadoop.hdds.scm.container.replication.ContainerCheckRequest; +import org.apache.hadoop.hdds.scm.container.replication.ContainerReplicaOp; +import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager; +import org.apache.hadoop.hdds.scm.container.replication.ReplicationTestUtil; +import org.apache.ratis.protocol.exceptions.NotLeaderException; +import org.junit.Assert; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState.CLOSED; +import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState.DELETING; + +/** + * Tests for {@link DeletingContainerHandler}. + */ +public class TestDeletingContainerHandler { + private ReplicationManager replicationManager; + private DeletingContainerHandler deletingContainerHandler; + private ECReplicationConfig ecReplicationConfig; + private RatisReplicationConfig ratisReplicationConfig; + + + @BeforeEach + public void setup() throws IOException { + + ecReplicationConfig = new ECReplicationConfig(3, 2); + ratisReplicationConfig = RatisReplicationConfig.getInstance( + HddsProtos.ReplicationFactor.THREE); + replicationManager = Mockito.mock(ReplicationManager.class); + + Mockito.doNothing().when(replicationManager) + .updateContainerState(Mockito.any(ContainerID.class), + Mockito.any(HddsProtos.LifeCycleEvent.class)); + + deletingContainerHandler = + new DeletingContainerHandler(replicationManager); + } + + /** + * If a container is not in Deleting state, it should not be handled by + * DeletingContainerHandler. It should return false so the request can be + * passed to the next handler in the chain. + */ + @Test + public void testNonDeletingContainerReturnsFalse() { + ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo( + ecReplicationConfig, 1, CLOSED); + Set<ContainerReplica> containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSING, 1, 2, 3, 4, 5); + + ContainerCheckRequest request = new ContainerCheckRequest.Builder() + .setPendingOps(Collections.EMPTY_LIST) + .setReport(new ReplicationManagerReport()) + .setContainerInfo(containerInfo) + .setContainerReplicas(containerReplicas) + .build(); + + Assert.assertFalse(deletingContainerHandler.handle(request)); + } + + @Test + public void testNonDeletingRatisContainerReturnsFalse() { + ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo( + ratisReplicationConfig, 1, CLOSED); + Set<ContainerReplica> containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSING, 0, 0, 0); + + ContainerCheckRequest request = new ContainerCheckRequest.Builder() + .setPendingOps(Collections.EMPTY_LIST) + .setReport(new ReplicationManagerReport()) + .setContainerInfo(containerInfo) + .setContainerReplicas(containerReplicas) + .build(); + + Assert.assertFalse(deletingContainerHandler.handle(request)); + } + + /** + * If a container is in Deleting state and no replica exists, + * change the state of the container to DELETED. + */ + @Test + public void testCleanupIfNoReplicaExist() { + //ratis container + cleanupIfNoReplicaExist(RatisReplicationConfig.getInstance( + HddsProtos.ReplicationFactor.THREE), 1); + + //ec container + cleanupIfNoReplicaExist(ecReplicationConfig, 2); Review Comment: Is this 2 because it was already called once earlier for RATIS? It confused me at first. Maybe we can add a comment here explaining why it's 2. ########## hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/DeletingContainerHandler.java: ########## @@ -0,0 +1,94 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hdds.scm.container.replication.health; + +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.HddsProtos; +import org.apache.hadoop.hdds.scm.container.ContainerID; +import org.apache.hadoop.hdds.scm.container.ContainerInfo; +import org.apache.hadoop.hdds.scm.container.replication.ContainerCheckRequest; +import org.apache.hadoop.hdds.scm.container.replication.ContainerReplicaOp; +import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager; +import org.apache.ratis.protocol.exceptions.NotLeaderException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Set; +import java.util.stream.Collectors; + +/** + * Class used in Replication Manager to handle the + * replicas of containers in DELETING State. + */ +public class DeletingContainerHandler extends AbstractCheck { + private final ReplicationManager replicationManager; + + public static final Logger LOG = + LoggerFactory.getLogger(DeletingContainerHandler.class); + + public DeletingContainerHandler(ReplicationManager replicationManager) { + this.replicationManager = replicationManager; + } + + /** + * If the replica size of the container is 0, change the state Review Comment: NIT: We can change the comment to "If the number of replicas of the container is 0..." ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestDeletingContainerHandler.java: ########## @@ -0,0 +1,252 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hdds.scm.container.replication.health; + +import org.apache.hadoop.hdds.client.ECReplicationConfig; +import org.apache.hadoop.hdds.client.RatisReplicationConfig; +import org.apache.hadoop.hdds.client.ReplicationConfig; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.HddsProtos; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.ContainerReplicaProto; +import org.apache.hadoop.hdds.scm.container.ContainerID; +import org.apache.hadoop.hdds.scm.container.ContainerInfo; +import org.apache.hadoop.hdds.scm.container.ContainerReplica; +import org.apache.hadoop.hdds.scm.container.ReplicationManagerReport; +import org.apache.hadoop.hdds.scm.container.replication.ContainerCheckRequest; +import org.apache.hadoop.hdds.scm.container.replication.ContainerReplicaOp; +import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager; +import org.apache.hadoop.hdds.scm.container.replication.ReplicationTestUtil; +import org.apache.ratis.protocol.exceptions.NotLeaderException; +import org.junit.Assert; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState.CLOSED; +import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState.DELETING; + +/** + * Tests for {@link DeletingContainerHandler}. + */ +public class TestDeletingContainerHandler { + private ReplicationManager replicationManager; + private DeletingContainerHandler deletingContainerHandler; + private ECReplicationConfig ecReplicationConfig; + private RatisReplicationConfig ratisReplicationConfig; + + + @BeforeEach + public void setup() throws IOException { + + ecReplicationConfig = new ECReplicationConfig(3, 2); + ratisReplicationConfig = RatisReplicationConfig.getInstance( + HddsProtos.ReplicationFactor.THREE); + replicationManager = Mockito.mock(ReplicationManager.class); + + Mockito.doNothing().when(replicationManager) + .updateContainerState(Mockito.any(ContainerID.class), + Mockito.any(HddsProtos.LifeCycleEvent.class)); + + deletingContainerHandler = + new DeletingContainerHandler(replicationManager); + } + + /** + * If a container is not in Deleting state, it should not be handled by + * DeletingContainerHandler. It should return false so the request can be + * passed to the next handler in the chain. + */ + @Test + public void testNonDeletingContainerReturnsFalse() { + ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo( + ecReplicationConfig, 1, CLOSED); + Set<ContainerReplica> containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSING, 1, 2, 3, 4, 5); + + ContainerCheckRequest request = new ContainerCheckRequest.Builder() + .setPendingOps(Collections.EMPTY_LIST) + .setReport(new ReplicationManagerReport()) + .setContainerInfo(containerInfo) + .setContainerReplicas(containerReplicas) + .build(); + + Assert.assertFalse(deletingContainerHandler.handle(request)); + } + + @Test + public void testNonDeletingRatisContainerReturnsFalse() { + ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo( + ratisReplicationConfig, 1, CLOSED); + Set<ContainerReplica> containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSING, 0, 0, 0); + + ContainerCheckRequest request = new ContainerCheckRequest.Builder() + .setPendingOps(Collections.EMPTY_LIST) + .setReport(new ReplicationManagerReport()) + .setContainerInfo(containerInfo) + .setContainerReplicas(containerReplicas) + .build(); + + Assert.assertFalse(deletingContainerHandler.handle(request)); + } + + /** + * If a container is in Deleting state and no replica exists, + * change the state of the container to DELETED. + */ + @Test + public void testCleanupIfNoReplicaExist() { + //ratis container + cleanupIfNoReplicaExist(RatisReplicationConfig.getInstance( + HddsProtos.ReplicationFactor.THREE), 1); + + //ec container + cleanupIfNoReplicaExist(ecReplicationConfig, 2); + } + + + private void cleanupIfNoReplicaExist( + ReplicationConfig replicationConfig, int times) { + ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo( + replicationConfig, 1, DELETING); + + Set<ContainerReplica> containerReplicas = new HashSet<>(); + ContainerCheckRequest request = new ContainerCheckRequest.Builder() + .setPendingOps(Collections.EMPTY_LIST) + .setReport(new ReplicationManagerReport()) + .setContainerInfo(containerInfo) + .setContainerReplicas(containerReplicas) + .build(); + + Assert.assertTrue(deletingContainerHandler.handle(request)); + Mockito.verify(replicationManager, Mockito.times(times)) + .updateContainerState(Mockito.any(ContainerID.class), + Mockito.any(HddsProtos.LifeCycleEvent.class)); + } + + /** + * If a container is in Deleting state , some replicas exist and + * for each replica there is a pending delete, then do nothing. + */ + @Test + public void testNoNeedResendDeleteCommand() throws NotLeaderException { + //ratis container + ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo( + ratisReplicationConfig, 1, DELETING); + Set<ContainerReplica> containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSED, 0, 0, 0); + List<ContainerReplicaOp> pendingOps = new ArrayList<>(); + containerReplicas.forEach(r -> pendingOps.add( + ContainerReplicaOp.create(ContainerReplicaOp.PendingOpType.DELETE, + r.getDatanodeDetails(), r.getReplicaIndex()))); + resendDeleteCommand(containerInfo, containerReplicas, pendingOps, 0); + + //EC container + containerInfo = ReplicationTestUtil.createContainerInfo( + ecReplicationConfig, 1, DELETING); + containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSED, 1, 2, 3, 4, 5); + pendingOps.clear(); + containerReplicas.forEach(r -> pendingOps.add( + ContainerReplicaOp.create(ContainerReplicaOp.PendingOpType.DELETE, + r.getDatanodeDetails(), r.getReplicaIndex()))); + resendDeleteCommand(containerInfo, containerReplicas, pendingOps, 0); + + } + + /** + * If a container is in Deleting state , some replicas exist and + * for some replica there is no pending delete, then resending delete + * command. + */ + @Test + public void testResendDeleteCommand() throws NotLeaderException { + //ratis container + ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo( + ratisReplicationConfig, 1, DELETING); + Set<ContainerReplica> containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSED, 0, 0, 0); + List<ContainerReplicaOp> pendingOps = new ArrayList<>(); + Set<ContainerReplica> tempContainerReplicas = new HashSet<>(); + tempContainerReplicas.addAll(containerReplicas); + Iterator iter = tempContainerReplicas.iterator(); + iter.next(); + iter.remove(); + Assert.assertEquals(2, tempContainerReplicas.size()); + tempContainerReplicas.forEach(r -> pendingOps.add( + ContainerReplicaOp.create(ContainerReplicaOp.PendingOpType.DELETE, + r.getDatanodeDetails(), r.getReplicaIndex()))); + resendDeleteCommand(containerInfo, containerReplicas, pendingOps, 1); Review Comment: This part is not very clear to me. Can you please explain what's being done here? If we're trying add the DELETE op to only two replicas, something like this could be easier to understand: ```suggestion containerReplicas.stream().limit(2).forEach(replica -> pendingOps.add( ContainerReplicaOp.create(ContainerReplicaOp.PendingOpType.DELETE, replica.getDatanodeDetails(), replica.getReplicaIndex()))); ``` ########## hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/DeletingContainerHandler.java: ########## @@ -0,0 +1,94 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hdds.scm.container.replication.health; + +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.HddsProtos; +import org.apache.hadoop.hdds.scm.container.ContainerID; +import org.apache.hadoop.hdds.scm.container.ContainerInfo; +import org.apache.hadoop.hdds.scm.container.replication.ContainerCheckRequest; +import org.apache.hadoop.hdds.scm.container.replication.ContainerReplicaOp; +import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager; +import org.apache.ratis.protocol.exceptions.NotLeaderException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Set; +import java.util.stream.Collectors; + +/** + * Class used in Replication Manager to handle the + * replicas of containers in DELETING State. + */ +public class DeletingContainerHandler extends AbstractCheck { + private final ReplicationManager replicationManager; + + public static final Logger LOG = + LoggerFactory.getLogger(DeletingContainerHandler.class); + + public DeletingContainerHandler(ReplicationManager replicationManager) { + this.replicationManager = replicationManager; + } + + /** + * If the replica size of the container is 0, change the state + * of the container to Deleted, otherwise resend delete command if needed. + * @param request ContainerCheckRequest object representing the container + * @return false if the specified container is not in DELETING state, + * otherwise true. Review Comment: NIT: Since we are also handling DELETED containers here, the comment can be, "false if the specified container is not in DELETING or DELETED state..." ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestDeletingContainerHandler.java: ########## @@ -0,0 +1,252 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hdds.scm.container.replication.health; + +import org.apache.hadoop.hdds.client.ECReplicationConfig; +import org.apache.hadoop.hdds.client.RatisReplicationConfig; +import org.apache.hadoop.hdds.client.ReplicationConfig; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.HddsProtos; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.ContainerReplicaProto; +import org.apache.hadoop.hdds.scm.container.ContainerID; +import org.apache.hadoop.hdds.scm.container.ContainerInfo; +import org.apache.hadoop.hdds.scm.container.ContainerReplica; +import org.apache.hadoop.hdds.scm.container.ReplicationManagerReport; +import org.apache.hadoop.hdds.scm.container.replication.ContainerCheckRequest; +import org.apache.hadoop.hdds.scm.container.replication.ContainerReplicaOp; +import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager; +import org.apache.hadoop.hdds.scm.container.replication.ReplicationTestUtil; +import org.apache.ratis.protocol.exceptions.NotLeaderException; +import org.junit.Assert; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState.CLOSED; +import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState.DELETING; + +/** + * Tests for {@link DeletingContainerHandler}. + */ +public class TestDeletingContainerHandler { + private ReplicationManager replicationManager; + private DeletingContainerHandler deletingContainerHandler; + private ECReplicationConfig ecReplicationConfig; + private RatisReplicationConfig ratisReplicationConfig; + + + @BeforeEach + public void setup() throws IOException { + + ecReplicationConfig = new ECReplicationConfig(3, 2); + ratisReplicationConfig = RatisReplicationConfig.getInstance( + HddsProtos.ReplicationFactor.THREE); + replicationManager = Mockito.mock(ReplicationManager.class); + + Mockito.doNothing().when(replicationManager) + .updateContainerState(Mockito.any(ContainerID.class), + Mockito.any(HddsProtos.LifeCycleEvent.class)); + + deletingContainerHandler = + new DeletingContainerHandler(replicationManager); + } + + /** + * If a container is not in Deleting state, it should not be handled by + * DeletingContainerHandler. It should return false so the request can be + * passed to the next handler in the chain. + */ + @Test + public void testNonDeletingContainerReturnsFalse() { + ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo( + ecReplicationConfig, 1, CLOSED); + Set<ContainerReplica> containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSING, 1, 2, 3, 4, 5); + + ContainerCheckRequest request = new ContainerCheckRequest.Builder() + .setPendingOps(Collections.EMPTY_LIST) + .setReport(new ReplicationManagerReport()) + .setContainerInfo(containerInfo) + .setContainerReplicas(containerReplicas) + .build(); + + Assert.assertFalse(deletingContainerHandler.handle(request)); + } + + @Test + public void testNonDeletingRatisContainerReturnsFalse() { + ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo( + ratisReplicationConfig, 1, CLOSED); + Set<ContainerReplica> containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSING, 0, 0, 0); + + ContainerCheckRequest request = new ContainerCheckRequest.Builder() + .setPendingOps(Collections.EMPTY_LIST) + .setReport(new ReplicationManagerReport()) + .setContainerInfo(containerInfo) + .setContainerReplicas(containerReplicas) + .build(); + + Assert.assertFalse(deletingContainerHandler.handle(request)); + } + + /** + * If a container is in Deleting state and no replica exists, + * change the state of the container to DELETED. + */ + @Test + public void testCleanupIfNoReplicaExist() { + //ratis container + cleanupIfNoReplicaExist(RatisReplicationConfig.getInstance( + HddsProtos.ReplicationFactor.THREE), 1); + + //ec container + cleanupIfNoReplicaExist(ecReplicationConfig, 2); + } + + + private void cleanupIfNoReplicaExist( + ReplicationConfig replicationConfig, int times) { + ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo( + replicationConfig, 1, DELETING); + + Set<ContainerReplica> containerReplicas = new HashSet<>(); + ContainerCheckRequest request = new ContainerCheckRequest.Builder() + .setPendingOps(Collections.EMPTY_LIST) + .setReport(new ReplicationManagerReport()) + .setContainerInfo(containerInfo) + .setContainerReplicas(containerReplicas) + .build(); + + Assert.assertTrue(deletingContainerHandler.handle(request)); + Mockito.verify(replicationManager, Mockito.times(times)) + .updateContainerState(Mockito.any(ContainerID.class), + Mockito.any(HddsProtos.LifeCycleEvent.class)); + } + + /** + * If a container is in Deleting state , some replicas exist and + * for each replica there is a pending delete, then do nothing. + */ + @Test + public void testNoNeedResendDeleteCommand() throws NotLeaderException { + //ratis container + ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo( + ratisReplicationConfig, 1, DELETING); + Set<ContainerReplica> containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSED, 0, 0, 0); + List<ContainerReplicaOp> pendingOps = new ArrayList<>(); + containerReplicas.forEach(r -> pendingOps.add( + ContainerReplicaOp.create(ContainerReplicaOp.PendingOpType.DELETE, + r.getDatanodeDetails(), r.getReplicaIndex()))); + resendDeleteCommand(containerInfo, containerReplicas, pendingOps, 0); + + //EC container + containerInfo = ReplicationTestUtil.createContainerInfo( + ecReplicationConfig, 1, DELETING); + containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSED, 1, 2, 3, 4, 5); + pendingOps.clear(); + containerReplicas.forEach(r -> pendingOps.add( + ContainerReplicaOp.create(ContainerReplicaOp.PendingOpType.DELETE, + r.getDatanodeDetails(), r.getReplicaIndex()))); + resendDeleteCommand(containerInfo, containerReplicas, pendingOps, 0); + + } + + /** + * If a container is in Deleting state , some replicas exist and + * for some replica there is no pending delete, then resending delete + * command. + */ + @Test + public void testResendDeleteCommand() throws NotLeaderException { + //ratis container + ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo( + ratisReplicationConfig, 1, DELETING); + Set<ContainerReplica> containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSED, 0, 0, 0); + List<ContainerReplicaOp> pendingOps = new ArrayList<>(); + Set<ContainerReplica> tempContainerReplicas = new HashSet<>(); + tempContainerReplicas.addAll(containerReplicas); + Iterator iter = tempContainerReplicas.iterator(); + iter.next(); + iter.remove(); + Assert.assertEquals(2, tempContainerReplicas.size()); + tempContainerReplicas.forEach(r -> pendingOps.add( + ContainerReplicaOp.create(ContainerReplicaOp.PendingOpType.DELETE, + r.getDatanodeDetails(), r.getReplicaIndex()))); + resendDeleteCommand(containerInfo, containerReplicas, pendingOps, 1); + + //EC container + containerInfo = ReplicationTestUtil.createContainerInfo( + ecReplicationConfig, 1, DELETING); + containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSED, 1, 2, 3, 4, 5); + pendingOps.clear(); + tempContainerReplicas.clear(); + tempContainerReplicas.addAll(containerReplicas); + iter = tempContainerReplicas.iterator(); + iter.next(); + iter.remove(); + iter.next(); + iter.remove(); + Assert.assertEquals(3, tempContainerReplicas.size()); + + tempContainerReplicas.forEach(r -> pendingOps.add( + ContainerReplicaOp.create(ContainerReplicaOp.PendingOpType.DELETE, + r.getDatanodeDetails(), r.getReplicaIndex()))); Review Comment: Same comment as above ########## hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/health/TestDeletingContainerHandler.java: ########## @@ -0,0 +1,252 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hdds.scm.container.replication.health; + +import org.apache.hadoop.hdds.client.ECReplicationConfig; +import org.apache.hadoop.hdds.client.RatisReplicationConfig; +import org.apache.hadoop.hdds.client.ReplicationConfig; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.HddsProtos; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.ContainerReplicaProto; +import org.apache.hadoop.hdds.scm.container.ContainerID; +import org.apache.hadoop.hdds.scm.container.ContainerInfo; +import org.apache.hadoop.hdds.scm.container.ContainerReplica; +import org.apache.hadoop.hdds.scm.container.ReplicationManagerReport; +import org.apache.hadoop.hdds.scm.container.replication.ContainerCheckRequest; +import org.apache.hadoop.hdds.scm.container.replication.ContainerReplicaOp; +import org.apache.hadoop.hdds.scm.container.replication.ReplicationManager; +import org.apache.hadoop.hdds.scm.container.replication.ReplicationTestUtil; +import org.apache.ratis.protocol.exceptions.NotLeaderException; +import org.junit.Assert; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState.CLOSED; +import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState.DELETING; + +/** + * Tests for {@link DeletingContainerHandler}. + */ +public class TestDeletingContainerHandler { + private ReplicationManager replicationManager; + private DeletingContainerHandler deletingContainerHandler; + private ECReplicationConfig ecReplicationConfig; + private RatisReplicationConfig ratisReplicationConfig; + + + @BeforeEach + public void setup() throws IOException { + + ecReplicationConfig = new ECReplicationConfig(3, 2); + ratisReplicationConfig = RatisReplicationConfig.getInstance( + HddsProtos.ReplicationFactor.THREE); + replicationManager = Mockito.mock(ReplicationManager.class); + + Mockito.doNothing().when(replicationManager) + .updateContainerState(Mockito.any(ContainerID.class), + Mockito.any(HddsProtos.LifeCycleEvent.class)); + + deletingContainerHandler = + new DeletingContainerHandler(replicationManager); + } + + /** + * If a container is not in Deleting state, it should not be handled by + * DeletingContainerHandler. It should return false so the request can be + * passed to the next handler in the chain. + */ + @Test + public void testNonDeletingContainerReturnsFalse() { + ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo( + ecReplicationConfig, 1, CLOSED); + Set<ContainerReplica> containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSING, 1, 2, 3, 4, 5); + + ContainerCheckRequest request = new ContainerCheckRequest.Builder() + .setPendingOps(Collections.EMPTY_LIST) + .setReport(new ReplicationManagerReport()) + .setContainerInfo(containerInfo) + .setContainerReplicas(containerReplicas) + .build(); + + Assert.assertFalse(deletingContainerHandler.handle(request)); + } + + @Test + public void testNonDeletingRatisContainerReturnsFalse() { + ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo( + ratisReplicationConfig, 1, CLOSED); + Set<ContainerReplica> containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSING, 0, 0, 0); + + ContainerCheckRequest request = new ContainerCheckRequest.Builder() + .setPendingOps(Collections.EMPTY_LIST) + .setReport(new ReplicationManagerReport()) + .setContainerInfo(containerInfo) + .setContainerReplicas(containerReplicas) + .build(); + + Assert.assertFalse(deletingContainerHandler.handle(request)); + } + + /** + * If a container is in Deleting state and no replica exists, + * change the state of the container to DELETED. + */ + @Test + public void testCleanupIfNoReplicaExist() { + //ratis container + cleanupIfNoReplicaExist(RatisReplicationConfig.getInstance( + HddsProtos.ReplicationFactor.THREE), 1); + + //ec container + cleanupIfNoReplicaExist(ecReplicationConfig, 2); + } + + + private void cleanupIfNoReplicaExist( + ReplicationConfig replicationConfig, int times) { + ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo( + replicationConfig, 1, DELETING); + + Set<ContainerReplica> containerReplicas = new HashSet<>(); + ContainerCheckRequest request = new ContainerCheckRequest.Builder() + .setPendingOps(Collections.EMPTY_LIST) + .setReport(new ReplicationManagerReport()) + .setContainerInfo(containerInfo) + .setContainerReplicas(containerReplicas) + .build(); + + Assert.assertTrue(deletingContainerHandler.handle(request)); + Mockito.verify(replicationManager, Mockito.times(times)) + .updateContainerState(Mockito.any(ContainerID.class), + Mockito.any(HddsProtos.LifeCycleEvent.class)); + } + + /** + * If a container is in Deleting state , some replicas exist and + * for each replica there is a pending delete, then do nothing. + */ + @Test + public void testNoNeedResendDeleteCommand() throws NotLeaderException { + //ratis container + ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo( + ratisReplicationConfig, 1, DELETING); + Set<ContainerReplica> containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSED, 0, 0, 0); + List<ContainerReplicaOp> pendingOps = new ArrayList<>(); + containerReplicas.forEach(r -> pendingOps.add( + ContainerReplicaOp.create(ContainerReplicaOp.PendingOpType.DELETE, + r.getDatanodeDetails(), r.getReplicaIndex()))); + resendDeleteCommand(containerInfo, containerReplicas, pendingOps, 0); + + //EC container + containerInfo = ReplicationTestUtil.createContainerInfo( + ecReplicationConfig, 1, DELETING); + containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSED, 1, 2, 3, 4, 5); + pendingOps.clear(); + containerReplicas.forEach(r -> pendingOps.add( + ContainerReplicaOp.create(ContainerReplicaOp.PendingOpType.DELETE, + r.getDatanodeDetails(), r.getReplicaIndex()))); + resendDeleteCommand(containerInfo, containerReplicas, pendingOps, 0); + + } + + /** + * If a container is in Deleting state , some replicas exist and + * for some replica there is no pending delete, then resending delete + * command. + */ + @Test + public void testResendDeleteCommand() throws NotLeaderException { + //ratis container + ContainerInfo containerInfo = ReplicationTestUtil.createContainerInfo( + ratisReplicationConfig, 1, DELETING); + Set<ContainerReplica> containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSED, 0, 0, 0); + List<ContainerReplicaOp> pendingOps = new ArrayList<>(); + Set<ContainerReplica> tempContainerReplicas = new HashSet<>(); + tempContainerReplicas.addAll(containerReplicas); + Iterator iter = tempContainerReplicas.iterator(); + iter.next(); + iter.remove(); + Assert.assertEquals(2, tempContainerReplicas.size()); + tempContainerReplicas.forEach(r -> pendingOps.add( + ContainerReplicaOp.create(ContainerReplicaOp.PendingOpType.DELETE, + r.getDatanodeDetails(), r.getReplicaIndex()))); + resendDeleteCommand(containerInfo, containerReplicas, pendingOps, 1); + + //EC container + containerInfo = ReplicationTestUtil.createContainerInfo( + ecReplicationConfig, 1, DELETING); + containerReplicas = ReplicationTestUtil + .createReplicas(containerInfo.containerID(), + ContainerReplicaProto.State.CLOSED, 1, 2, 3, 4, 5); + pendingOps.clear(); + tempContainerReplicas.clear(); + tempContainerReplicas.addAll(containerReplicas); + iter = tempContainerReplicas.iterator(); + iter.next(); + iter.remove(); + iter.next(); + iter.remove(); + Assert.assertEquals(3, tempContainerReplicas.size()); + + tempContainerReplicas.forEach(r -> pendingOps.add( + ContainerReplicaOp.create(ContainerReplicaOp.PendingOpType.DELETE, + r.getDatanodeDetails(), r.getReplicaIndex()))); + //since one delete command is end when testing ratis container, so + //here should be 1+2 = 3 times + resendDeleteCommand(containerInfo, containerReplicas, pendingOps, 3); + + } + + private void resendDeleteCommand(ContainerInfo containerInfo, Review Comment: Perhaps we can rename this method to `verifyDeleteCommandCount` -- 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]
