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.

Sign up for GitHub

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

kvcoord: evict range cache on unsplittable batches #119510

Closed
wants to merge 1 commit into from
Closed

kvcoord: evict range cache on unsplittable batches #119510

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions pkg/kv/kvclient/kvcoord/dist_sender.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1495,12 +1495,15 @@ func (ds *DistSender) divideAndSendBatchToRanges(
return resp.reply, resp.pErr
}

// The batch spans ranges (according to our cached range descriptors).
// Verify that this is ok.
// TODO(tschottdorf): we should have a mechanism for discovering range
// merges (descriptor staleness will mostly go unnoticed), or we'll be
// turning single-range queries into multi-range queries for no good
// reason.
// The batch spans ranges (according to our cached range descriptors). Either
// the client has an outdated view of the range descriptor and didn't see a
// split, or we have an outdated view of the range descriptor and didn't see a
// merge. Evict the descriptor in case it's the latter. This case should be
// fairly rare.
//
// TODO(tschottdorf): we should have a mechanism for discovering range merges
// (descriptor staleness will mostly go unnoticed), or we'll be evicting the
// cache for no good reason.
if ba.IsUnsplittable() {
mismatch := kvpb.NewRangeKeyMismatchErrorWithCTPolicy(ctx,
rs.Key.AsRawKey(),
Expand All @@ -1509,6 +1512,9 @@ func (ds *DistSender) divideAndSendBatchToRanges(
nil, /* lease */
ri.ClosedTimestampPolicy(),
)
// Evict the cached descriptor after constructing the error.
tok := ri.Token()
tok.Evict(ctx)
return nil, kvpb.NewError(mismatch)
}
// If there's no transaction and ba spans ranges, possibly re-run as part of
Expand Down
Loading