txn: support shared lock for lock wait table#19271
Merged
ti-chi-bot[bot] merged 6 commits intotikv:masterfrom Jan 9, 2026
Merged
txn: support shared lock for lock wait table#19271ti-chi-bot[bot] merged 6 commits intotikv:masterfrom
ti-chi-bot[bot] merged 6 commits intotikv:masterfrom
Conversation
* implement lock waiting queue Signed-off-by: you06 <you1474600@gmail.com> * donot track shared lock in deadlock detector Signed-off-by: you06 <you1474600@gmail.com> * support lock wakeup for shared lock Signed-off-by: you06 <you1474600@gmail.com> * fmt code Signed-off-by: you06 <you1474600@gmail.com> * rename param Signed-off-by: you06 <you1474600@gmail.com> * remove unused test function Signed-off-by: you06 <you1474600@gmail.com> * boxed LockWaitEntry Signed-off-by: you06 <you1474600@gmail.com> --------- Signed-off-by: you06 <you1474600@gmail.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adds support for shared locks in the lock wait table, enabling multiple waiters for shared locks to be woken up simultaneously when a conflicting lock is released. This is preparatory work for full shared lock support.
Key changes:
- Extended
AcquirePessimisticLockcommand to accept 3-tuple keys (key, should_not_exist, is_shared_lock) - Modified lock wait queue to group and wake up consecutive shared lock waiters together
- Added detection and handling for shared lock commands to disable in-memory pessimistic lock optimization
- Excluded shared locks from deadlock detection
Reviewed changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
src/storage/txn/commands/acquire_pessimistic_lock.rs |
Updated key tuple format to include is_shared_lock flag |
src/storage/lock_manager/lock_waiting_queue.rs |
Implemented group wake-up logic for consecutive shared lock waiters |
src/storage/txn/scheduler.rs |
Added shared lock command detection and modified wake-up handling to process multiple entries |
src/server/lock_manager/mod.rs |
Excluded shared locks from deadlock detection |
src/storage/mod.rs |
Updated test helper functions to support new 3-tuple format |
src/storage/txn/commands/mod.rs |
Updated protocol buffer conversion to extract shared lock flag |
tests/failpoints/cases/test_storage.rs |
Updated test cases to use new 3-tuple format |
| Multiple test files | Added is_shared_lock field initialization in test code |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Signed-off-by: you06 <you1474600@gmail.com>
Signed-off-by: you06 <you1474600@gmail.com>
Contributor
Author
|
/retest |
13 tasks
zyguan
reviewed
Jan 8, 2026
cfzjywxk
reviewed
Jan 8, 2026
Signed-off-by: you06 <you1474600@gmail.com>
zyguan
approved these changes
Jan 8, 2026
cfzjywxk
approved these changes
Jan 8, 2026
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cfzjywxk, zyguan The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Contributor
Contributor
Author
|
/retest |
Contributor
Author
|
The clippy failed because aws-sdk-s3 is pinned to |
zyguan
reviewed
Jan 9, 2026
Signed-off-by: you06 <you1474600@gmail.com>
Signed-off-by: you06 <you1474600@gmail.com>
glorv
reviewed
Jan 9, 2026
| # aws-sdk-s3 transitively depends on lru 0.12.x, which triggers | ||
| # RUSTSEC-2026-0002 (Stacked Borrows UB). Upstream dependency | ||
| # constraints prevent upgrading at the moment. | ||
| "RUSTSEC-2026-0002", |
Contributor
Author
|
/retest |
ekexium
pushed a commit
to ti-chi-bot/tikv
that referenced
this pull request
Jan 19, 2026
ref tikv#19249 Fix the CI by ignoring `RUSTSEC-2026-0002`. Signed-off-by: you06 <you1474600@gmail.com>
you06-pingcap
pushed a commit
to you06/tikv
that referenced
this pull request
Feb 27, 2026
ref tikv#19087 Handle the shared lock in the lock wait table. Signed-off-by: you06 <you1474600@gmail.com>
9 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What is changed and how it works?
Issue Number: ref #19087
What's Changed:
Related changes
pingcap/docs/pingcap/docs-cn:Check List
Tests
Side effects
Release note