Skip to content
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.

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

requestbatcher: deflake TestBatchTimeout #98512

Merged

Conversation

nvanbenschoten
Copy link
Member

Fixes #97832.

This commit deflakes TestBatchTimeout/WithTimeoutAndPagination. The test was setting an aggressive MaxTimeout and then not handling all cases where the timeout could fire. Luckily, the test did not ever actually want the timeout to fire, so we can deflake it by simply setting a large (but non-zero) MaxTimeout. This still allows us to assert that time timeout is applied across all sub-batches in a paginated request.

Release note: None

Fixes cockroachdb#97832.

This commit deflakes `TestBatchTimeout/WithTimeoutAndPagination`. The
test was setting an aggressive MaxTimeout and then not handling all
cases where the timeout could fire. Luckily, the test did not ever
actually want the timeout to fire, so we can deflake it by simply
setting a large (but non-zero) MaxTimeout. This still allows us to
assert that time timeout is applied across all sub-batches in a
paginated request.

Release note: None
@nvanbenschoten nvanbenschoten requested a review from a team as a code owner March 13, 2023 18:10
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@arulajmani arulajmani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @nvanbenschoten)

@nvanbenschoten
Copy link
Member Author

TFTR!

bors r+

@craig
Copy link
Contributor

craig bot commented Mar 13, 2023

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Mar 13, 2023

This PR was included in a batch that was canceled, it will be automatically retried

@craig
Copy link
Contributor

craig bot commented Mar 14, 2023

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Mar 14, 2023

Build succeeded:

@craig craig bot merged commit 0595b4a into cockroachdb:master Mar 14, 2023
@nvanbenschoten nvanbenschoten deleted the nvanbenschoten/deflake97832 branch March 21, 2023 14:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

internal/client/requestbatcher: TestBatchTimeout failed
3 participants