sodonnel commented on code in PR #4014:
URL: https://github.com/apache/ozone/pull/4014#discussion_r1064595622
##########
hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestSCMCommonPlacementPolicy.java:
##########
@@ -286,6 +288,102 @@ public void testReplicasWithoutMisreplication() {
Assertions.assertEquals(0, replicasToCopy.size());
}
+ @Test
+ public void testReplicasToRemoveWithOneOverreplication() {
+ DummyPlacementPolicy dummyPlacementPolicy =
+ new DummyPlacementPolicy(nodeManager, conf, 5);
+ List<DatanodeDetails> list = nodeManager.getAllNodes();
+ Set<ContainerReplica> replicas = Sets.newHashSet(
+ HddsTestUtils.getReplicasWithReplicaIndex(
+ new ContainerID(1), CLOSED, 0, 0, 0, list.subList(1, 6)));
+ ContainerReplica replica = ContainerReplica.newBuilder()
+ .setContainerID(new ContainerID(1))
+ .setContainerState(CLOSED)
+ .setReplicaIndex(1)
+ .setDatanodeDetails(list.get(7)).build();
+ replicas.add(replica);
+
+ Set<ContainerReplica> replicasToRemove = dummyPlacementPolicy
+ .replicasToRemoveToFixOverreplication(replicas, 1);
+ Assertions.assertEquals(replicasToRemove.size(), 1);
+ Assertions.assertEquals(replicasToRemove.stream().findFirst().get(),
+ replica);
+ }
+
+ @Test
+ public void testReplicasToRemoveWithTwoOverreplication() {
+ DummyPlacementPolicy dummyPlacementPolicy =
+ new DummyPlacementPolicy(nodeManager, conf, 5);
+ List<DatanodeDetails> list = nodeManager.getAllNodes();
+
+ Set<ContainerReplica> replicas = Sets.newHashSet(
+ HddsTestUtils.getReplicasWithReplicaIndex(
+ new ContainerID(1), CLOSED, 0, 0, 0, list.subList(1, 6)));
+
+ Set<ContainerReplica> replicasToBeRemoved = Sets.newHashSet(
+ HddsTestUtils.getReplicasWithReplicaIndex(
+ new ContainerID(1), CLOSED, 0, 0, 0, list.subList(7, 9)));
+ replicas.addAll(replicasToBeRemoved);
+
+ Set<ContainerReplica> replicasToRemove = dummyPlacementPolicy
+ .replicasToRemoveToFixOverreplication(replicas, 1);
+ Assertions.assertEquals(replicasToRemove.size(), 2);
+ Assertions.assertEquals(replicasToRemove, replicasToBeRemoved);
+ }
+
+ @Test
+ public void testReplicasToRemoveWithOverreplicationWithinSameRack() {
+ DummyPlacementPolicy dummyPlacementPolicy =
+ new DummyPlacementPolicy(nodeManager, conf, 3);
+ List<DatanodeDetails> list = nodeManager.getAllNodes();
+
+ Set<ContainerReplica> replicas = Sets.newHashSet(
+ HddsTestUtils.getReplicasWithReplicaIndex(
+ new ContainerID(1), CLOSED, 0, 0, 0, list.subList(1, 6)));
+
+ ContainerReplica replica1 = ContainerReplica.newBuilder()
+ .setContainerID(new ContainerID(1))
+ .setContainerState(CLOSED)
+ .setReplicaIndex(1)
+ .setDatanodeDetails(list.get(6)).build();
+ replicas.add(replica1);
+ ContainerReplica replica2 = ContainerReplica.newBuilder()
+ .setContainerID(new ContainerID(1))
+ .setContainerState(CLOSED)
+ .setReplicaIndex(1)
+ .setDatanodeDetails(list.get(0)).build();
+ replicas.add(replica2);
+
+ Set<ContainerReplica> replicasToRemove = dummyPlacementPolicy
+ .replicasToRemoveToFixOverreplication(replicas, 1);
+ Map<Node, Long> removedReplicasRackCntMap = replicasToRemove.stream()
+ .map(ContainerReplica::getDatanodeDetails)
+ .map(dummyPlacementPolicy::getPlacementGroup)
+ .collect(Collectors.groupingBy(Function.identity(),
+ Collectors.counting()));
+ Assertions.assertEquals(replicasToRemove.size(), 2);
+ Assertions.assertTrue(Sets.newHashSet(1L, 2L).contains(
+ removedReplicasRackCntMap.get(dummyPlacementPolicy.racks.get(0))));
+ Assertions.assertEquals(
+ removedReplicasRackCntMap.get(dummyPlacementPolicy.racks.get(1)),
+ removedReplicasRackCntMap.get(dummyPlacementPolicy.racks.get(0))
+ == 2 ? 0 : 1);
+ }
+
+ @Test
+ public void testReplicasToRemoveWithNoOverreplication() {
+ DummyPlacementPolicy dummyPlacementPolicy =
+ new DummyPlacementPolicy(nodeManager, conf, 5);
+ List<DatanodeDetails> list = nodeManager.getAllNodes();
+ Set<ContainerReplica> replicas = Sets.newHashSet(
+ HddsTestUtils.getReplicasWithReplicaIndex(
+ new ContainerID(1), CLOSED, 0, 0, 0, list.subList(1, 6)));
+
+ Set<ContainerReplica> replicasToRemove = dummyPlacementPolicy
+ .replicasToRemoveToFixOverreplication(replicas, 1);
+ Assertions.assertEquals(replicasToRemove.size(), 0);
+ }
+
Review Comment:
We could probably use a test or two where the second parameter into
`replicasToRemoveToFixOverreplication` is greater than 1, eg 3 to give us some
tests that cover the Ratis use case.
--
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]
