HDDS-10070. Intermittent failure in TestWritableRatisContainerProvider#5930
Merged
adoroszlai merged 1 commit intoapache:masterfrom Jan 5, 2024
Merged
HDDS-10070. Intermittent failure in TestWritableRatisContainerProvider#5930adoroszlai merged 1 commit intoapache:masterfrom
adoroszlai merged 1 commit intoapache:masterfrom
Conversation
sodonnel
approved these changes
Jan 5, 2024
Contributor
sodonnel
left a comment
sodonnel
left a comment
There was a problem hiding this comment.
LGTM. Thanks for quickly fixing this.
Contributor
Author
|
Thanks @sodonnel for the review. |
xichen01
pushed a commit
to xichen01/ozone
that referenced
this pull request
Jul 17, 2024
apache#5930) (cherry picked from commit c39c554)
xichen01
pushed a commit
to xichen01/ozone
that referenced
this pull request
Jul 17, 2024
apache#5930) (cherry picked from commit c39c554)
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?
Fix intermittent failure in
TestWritableRatisContainerProvider#skipsPipelineWithoutContainer.One of the pipelines has a container (stubbing for
getMatchingContainer), the other doesn't. Mocks returnnullfor calls without stubbing, and the test relies on that for the pipeline without container. The problem is that Mockito is also strict by default. When it sees the non-stubbed pipeline, it reports this error. Pipelines are returned bygetPipelinesin the right order (one without container first), but the order in which they are actually checked depends onPipelineChoosePolicy.The problem can be reproduced by changing the test case to
@RepeatedTest(100).The fix sets lenient mode for Mockito in the test class to be able to rely on the default.
This also exposed another problem: lists used by the test as return value for stubbed
getPipelinesdo not supportremove(invoked byWritableRatisContainerProviderduring iteration of pipelines). This is fixed by wrapping inArrayList.https://issues.apache.org/jira/browse/HDDS-10070
How was this patch tested?
Unit test passes with
@RepeatedTest(100)(which is left in place to catch such problems in the future).CI: (pending)