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

kv: deflake TestStoreRangeMergeWithData #127366

Merged

Conversation

nvanbenschoten
Copy link
Member

Fixes #126249.

This commit deflakes the test by making sure that the merge transaction does not get aborted after each time we manually advance the clock to trigger a lease acquisition.

Release note: None

@nvanbenschoten nvanbenschoten requested a review from a team as a code owner July 17, 2024 16:37
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@nvanbenschoten nvanbenschoten added backport-23.1.x Flags PRs that need to be backported to 23.1 backport-23.2.x Flags PRs that need to be backported to 23.2. backport-24.1.x Flags PRs that need to be backported to 24.1. backport-24.2.x Flags PRs that need to be backported to 24.2 labels Jul 17, 2024
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.

:lgtm:

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

@nvanbenschoten
Copy link
Member Author

bors r+

@craig
Copy link
Contributor

craig bot commented Jul 17, 2024

Build failed (retrying...):

@nvanbenschoten
Copy link
Member Author

bors r-

#127142 just merged.

@craig
Copy link
Contributor

craig bot commented Jul 17, 2024

Canceled.

Fixes cockroachdb#126249.

This commit deflakes the test by making sure that the merge transaction
does not get aborted after each time we manually advance the clock to
trigger a lease acquisition.

Release note: None
@nvanbenschoten nvanbenschoten force-pushed the nvanbenschoten/deflake126249 branch from dae494a to cdb29a2 Compare July 17, 2024 20:01
@nvanbenschoten
Copy link
Member Author

bors r+

@craig
Copy link
Contributor

craig bot commented Jul 17, 2024

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

@craig
Copy link
Contributor

craig bot commented Jul 17, 2024

Build failed (retrying...):

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.1.x Flags PRs that need to be backported to 23.1 backport-23.2.x Flags PRs that need to be backported to 23.2. backport-24.1.x Flags PRs that need to be backported to 24.1. backport-24.2.x Flags PRs that need to be backported to 24.2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

kv/kvserver: TestStoreRangeMergeWithData failed
3 participants