Skip to content

HDDS-14772. Delete EC replica when container state is already DELETED. #9872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 3 commits into from
Mar 8, 2026
+16 −7
Merged

HDDS-14772. Delete EC replica when container state is already DELETED. #9872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dba64df
HDDS-14772. Delete EC replica when container state is already DELETED.
ashishkr200 Mar 6, 2026
ed8d345
HDDS-14772. Return after delete.
ashishkr200 Mar 6, 2026
85e7723
Add test case
ashishkr200 Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...cm/src/main/java/org/apache/hadoop/hdds/scm/container/AbstractContainerReportHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,11 @@ private boolean updateContainerState(final DatanodeDetails datanode,
deleteReplica(containerId, datanode, publisher, "DELETED", false, detailsForLogging);
return false;
}
if (container.getReplicationType().equals(HddsProtos.ReplicationType.EC)) {
// In case of EC container, delete its replica to avoid orphan replica
deleteReplica(containerId, datanode, publisher, "DELETED", true, detailsForLogging);
return false;
}
// HDDS-12421: fall-through to case DELETING
case DELETING:
// HDDS-11136: If a DELETING container has a non-empty CLOSED replica, transition the container to CLOSED
Expand Down
4 changes: 4 additions & 0 deletions ...er-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,10 @@ static Stream<Arguments> containerAndReplicaStates() {
containerState.equals(HddsProtos.LifeCycleState.DELETING))) {
continue;
}
if (replicationType == HddsProtos.ReplicationType.EC &&
containerState.equals(HddsProtos.LifeCycleState.DELETED)) {
continue;
}
for (ContainerReplicaProto.State invalidState : invalidReplicaStates) {
combinations.add(Arguments.of(replicationType, containerState, replicaState, invalidState));
}
Expand Down
14 changes: 7 additions & 7 deletions ...ver-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,9 +301,8 @@ public void testDeletedContainerWithLowerBcsidStaleReplicaRatis()
}

/**
* DELETED EC container + CLOSED replica with BCSID <= container seqId.
* Expected: Should NOT send force delete
* Should transition to CLOSED instead
* DELETED EC container in SCM.
* Expected: Should send force delete to DN
*/
@Test
public void testDeletedECContainerWithStaleClosedReplicaShouldNotForceDelete()
Expand All @@ -318,11 +317,12 @@ public void testDeletedECContainerWithStaleClosedReplicaShouldNotForceDelete()
repConfig);
containerStateManager.addContainer(ecContainer.getProtobuf());
assertEquals(HddsProtos.ReplicationType.EC, ecContainer.getReplicationType());
// Report CLOSED replica with BCSID = container's seqId

// Verify delete command sent
sendReportAndCaptureDeleteCommand(ecContainer, datanode,
ecContainer.getSequenceId(), false, 1, false);
// Container should transition to CLOSED
verifyContainerState(ecContainer.containerID(), HddsProtos.LifeCycleState.CLOSED);
ecContainer.getSequenceId(), false, 1, true);
// Container should remain as DELETED
verifyContainerState(ecContainer.containerID(), HddsProtos.LifeCycleState.DELETED);
}

private DeleteContainerCommand sendReportAndCaptureDeleteCommand(
Expand Down