HDDS-8458. Intermittent timeout in TestBlockDeletion#testBlockDeletion#4624
Merged
adoroszlai merged 3 commits intoapache:masterfrom Apr 28, 2023
Merged
HDDS-8458. Intermittent timeout in TestBlockDeletion#testBlockDeletion#4624adoroszlai merged 3 commits intoapache:masterfrom
adoroszlai merged 3 commits intoapache:masterfrom
Conversation
adoroszlai
reviewed
Apr 27, 2023
Contributor
adoroszlai
left a comment
adoroszlai
left a comment
There was a problem hiding this comment.
Thanks @sumitagrawl for the patch.
In addition to the inline comment, you can also remove @Flaky("HDDS-8458") from line 190.
Comment on lines
+251
to
+260
| GenericTestUtils.waitFor(() -> { | ||
| return !(omKeyLocationInfoGroupList.stream().filter((group) -> | ||
| group.getLocationList().stream().filter( | ||
| (info) -> cluster.getHddsDatanodes().get(0) | ||
| .getDatanodeStateMachine().getContainer().getContainerSet() | ||
| .getContainer(info.getContainerID()).getContainerData() | ||
| .getState() != ContainerProtos.ContainerDataProto.State.CLOSED) | ||
| .findFirst().isPresent() | ||
| ).findFirst().isPresent()); | ||
| }, 1000, 30000); |
Contributor
There was a problem hiding this comment.
This can be simplified:
.filter(...).findFirst().isPresent()->anyMatch(...)!anyMatch()->noneMatch()noneMatch(... != ...)->allMatch(... == ...)- inner stream ->
flatMap { return ... }->...- store
ContainerSetin local variable
Like this:
ContainerSet containerSet = cluster.getHddsDatanodes().get(0)
.getDatanodeStateMachine().getContainer().getContainerSet();
GenericTestUtils.waitFor(() -> omKeyLocationInfoGroupList.stream()
.flatMap(group -> group.getLocationList().stream())
.allMatch(info -> containerSet.getContainer(info.getContainerID())
.getContainerData()
.getState() == ContainerProtos.ContainerDataProto.State.CLOSED),
1000, 30000);Please double-check for any mistakes I may have made.
adoroszlai
approved these changes
Apr 28, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
Thread sleep replaced with waiting for DN container to Closed
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-8458
How was this patch tested?
Flaky test fix, test case running multiple time