Skip to content

Commit fd9ae32

Browse files
sodonnelSlava Tutrinov
authored andcommitted
HDDS-12127. RM should not expire pending deletes, but retry until delete is confirmed or node is dead (apache#7746)
(cherry picked from commit 04f6255) Conflicts: hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerReplicaPendingOps.java hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestContainerReplicaPendingOps.java hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestECContainerReplicaCount.java hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManager.java hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerScenarios.java hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java
1 parent 4c5da18 commit fd9ae32

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManager.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,8 +510,7 @@ public void testQuasiClosedContainerWithVulnerableUnhealthyReplica()
510510
assertEquals(0, repQueue.overReplicatedQueueSize());
511511

512512
when(ratisPlacementPolicy.chooseDatanodes(anyList(), anyList(), eq(null), eq(1), anyLong(),
513-
anyLong())).thenAnswer(invocation ->
514-
ImmutableList.of(MockDatanodeDetails.randomDatanodeDetails()));
513+
anyLong())).thenAnswer(invocation -> ImmutableList.of(MockDatanodeDetails.randomDatanodeDetails()));
515514
when(nodeManager.getTotalDatanodeCommandCounts(any(DatanodeDetails.class), any(), any()))
516515
.thenAnswer(invocation -> {
517516
Map<SCMCommandProto.Type, Integer> map = new HashMap<>();

0 commit comments

Comments
 (0)