[12.x] Fix deadlock in cache_locks on cleanup #58071
Merged
+54
−1
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since #57966
The addition of the index has caused the below in various environments for me quite often, which I believe is down to using WithoutOverlapping middleware in high throughput queues:
The index seems to improve query performance, but changes the order it gets row locks - hence why this happens.
Since the cleanup is opportunistic (cause its using a lottery) this PR uses the existing
ConcurrencyErrorDetectorto identify and ignore concurrency failures, while continuing to throw any other errors.I've also added a test - which I think covers it - Any feedback or adjustments let me know 🫡