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: fix Replica.tenantLimiter race #110806

Merged
merged 2 commits into from Sep 20, 2023

Conversation

pav-kv
Copy link
Collaborator

@pav-kv pav-kv commented Sep 18, 2023

If a Replica is destroyed while or shortly before Send waits for the tenant rate limiter, the rate limiter returns a quotapool.ErrClosed which propagates all the way up to the SQL client. This commit fixes maybeRateLimitBatch to return the Replica destruction status error instead, so that the Send stack retries the request.

Release note (bug fix): fixed a race condition in Replica lifecycle which could result in a failed SQL request in cases where it could be successfully retried.

Fixes #109729
Epic: none

@pav-kv pav-kv requested a review from a team as a code owner September 18, 2023 13:07
@blathers-crl
Copy link

blathers-crl bot commented Sep 18, 2023

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@pav-kv
Copy link
Collaborator Author

pav-kv commented Sep 18, 2023

Writing a test for it.

@pav-kv
Copy link
Collaborator Author

pav-kv commented Sep 19, 2023

Stressed the new test a bunch, works.

Copy link
Contributor

@erikgrinaker erikgrinaker left a comment

Choose a reason for hiding this comment

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

Nice, thanks!

pkg/kv/kvserver/replica_rate_limit_test.go Outdated Show resolved Hide resolved
@erikgrinaker erikgrinaker added backport-22.2.x Flags PRs that need to be backported to 22.2. backport-23.1.x Flags PRs that need to be backported to 23.1 labels Sep 19, 2023
If a Replica is destroyed while or shortly before Send waits for the
tenant rate limiter, the rate limiter returns a quotapool.ErrClosed
which propagates all the way up to the SQL client. This commit fixes
maybeRateLimitBatch to return the Replica destruction status error
instead, so that the Send stack retries the request.

Release note (bug fix): fixed a race condition in Replica lifecycle
which could result in a failed SQL request in cases where it could be
successfully retried.

Epic: none
@pav-kv
Copy link
Collaborator Author

pav-kv commented Sep 20, 2023

bors r=erikgrinaker

@craig
Copy link
Contributor

craig bot commented Sep 20, 2023

Build succeeded:

@craig craig bot merged commit c3c93c0 into cockroachdb:master Sep 20, 2023
7 of 8 checks passed
@blathers-crl
Copy link

blathers-crl bot commented Sep 20, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from a1202b9 to blathers/backport-release-22.2-110806: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2.x failed. See errors above.


error creating merge commit from a1202b9 to blathers/backport-release-23.1-110806: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@pav-kv pav-kv deleted the fix-rate-limiter-race branch September 20, 2023 10:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-22.2.x Flags PRs that need to be backported to 22.2. backport-23.1.x Flags PRs that need to be backported to 23.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

sql/colflow: TestDrainingAfterRemoteError failed
3 participants