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

kvserver: increase shutdown propagation time in range merge test #118482

Merged

Conversation

kvoli
Copy link
Collaborator

@kvoli kvoli commented Jan 30, 2024

TestStoreRangeMergeDuringShutDown could occasionally flake when the shutdown hadn't propagated before applying the lease.

Increase the post-shutdown sleep from 10ms to 20ms.

Fixes: #118348
Release note: None

`TestStoreRangeMergeDuringShutDown` could occasionally flake when the
shutdown hadn't propagated before applying the lease.

Increase the post-shutdown sleep from 10ms to 20ms.

Fixes: cockroachdb#118348
Release note: None
@kvoli kvoli self-assigned this Jan 30, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@kvoli kvoli 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. labels Jan 30, 2024
@andrewbaptist
Copy link
Collaborator

I noticed this when I was working on some of my other shutdown code, but think the root problem is that there is a sleep here at all. I wonder if there is a way to restructure this test to use a different approach. I didn't change this since it was fairly deep in the code where this happens, and I wasn't sure where else to hook into.

I agree that bumping this timeout will likely resolve the issue.

@kvoli kvoli marked this pull request as ready for review January 30, 2024 17:46
@kvoli kvoli requested a review from a team as a code owner January 30, 2024 17:46
@kvoli kvoli requested a review from andrewbaptist January 30, 2024 17:47
Copy link
Collaborator

@andrewbaptist andrewbaptist left a comment

Choose a reason for hiding this comment

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

:lgtm:

@kvoli
Copy link
Collaborator Author

kvoli commented Jan 30, 2024

TYFTR

bors r=andrewbaptist

@craig
Copy link
Contributor

craig bot commented Jan 30, 2024

Build succeeded:

@craig craig bot merged commit 38dd16a into cockroachdb:master Jan 30, 2024
8 of 9 checks passed
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

kv/kvserver: TestStoreRangeMergeDuringShutdown failed
3 participants