Skip to content

HDDS-8458. Intermittent timeout in TestBlockDeletion#testBlockDeletion #4624

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
Apr 28, 2023
Merged

HDDS-8458. Intermittent timeout in TestBlockDeletion#testBlockDeletion #4624

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03f3787
HDDS-8458. Intermittent timeout in TestBlockDeletion#testBlockDeletion
sumitagrawl Apr 27, 2023
66fdc68
HDDS-8458. Intermittent timeout in TestBlockDeletion#testBlockDeletion
sumitagrawl Apr 28, 2023
37203a7
HDDS-8458. Intermittent timeout in TestBlockDeletion#testBlockDeletion
sumitagrawl Apr 28, 2023
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
24 changes: 13 additions & 11 deletions ...g/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ private static Stream<ReplicationConfig> replicationConfigs() {

@ParameterizedTest
@MethodSource("replicationConfigs")
@Flaky("HDDS-8458")
public void testBlockDeletion(ReplicationConfig repConfig) throws Exception {
String volumeName = UUID.randomUUID().toString();
String bucketName = UUID.randomUUID().toString();
Expand Down Expand Up @@ -246,17 +245,20 @@ public void testBlockDeletion(ReplicationConfig repConfig) throws Exception {
Assertions.assertEquals(0L, metrics.getNumBlockDeletionTransactionSent());
// close the containers which hold the blocks for the key
OzoneTestUtils.closeAllContainers(scm.getEventQueue(), scm);
Thread.sleep(2000);
// make sure the containers are closed on the dn
omKeyLocationInfoGroupList.forEach((group) -> {
List<OmKeyLocationInfo> locationInfo = group.getLocationList();
locationInfo.forEach(
(info) -> cluster.getHddsDatanodes().get(0).getDatanodeStateMachine()
.getContainer().getContainerSet()
.getContainer(info.getContainerID()).getContainerData()
.setState(ContainerProtos.ContainerDataProto.State.CLOSED));
});

// If any container present as not closed, i.e. matches some entry
// not closed, then return false for wait
ContainerSet containerSet = cluster.getHddsDatanodes().get(0)
.getDatanodeStateMachine().getContainer().getContainerSet();
GenericTestUtils.waitFor(() -> {
return !(omKeyLocationInfoGroupList.stream().anyMatch((group) ->
group.getLocationList().stream().anyMatch((info) ->
containerSet.getContainer(info.getContainerID()).getContainerData()
.getState() != ContainerProtos.ContainerDataProto.State.CLOSED
)
));
}, 1000, 30000);

// The blocks should be deleted in the DN.
GenericTestUtils.waitFor(() -> {
try {
Expand Down