This repository was archived by the owner on Jan 22, 2025. It is now read-only.
rpc: fix possible deadlock in rpc#26051
Merged
CriesofCarrots merged 1 commit intosolana-labs:masterfrom Jun 23, 2022
Merged
Conversation
Codecov Report
@@ Coverage Diff @@
## master #26051 +/- ##
=========================================
- Coverage 82.1% 81.8% -0.3%
=========================================
Files 628 631 +3
Lines 171471 174123 +2652
=========================================
+ Hits 140878 142595 +1717
- Misses 30593 31528 +935 |
Contributor
|
@BurtonQin , to be clear, there is only a risk of deadlock with write-prioritized |
Contributor
Author
Yes. |
CriesofCarrots
approved these changes
Jun 23, 2022
Contributor
CriesofCarrots
left a comment
There was a problem hiding this comment.
Thanks for the contribution
gregcusack
pushed a commit
to gregcusack/solana
that referenced
this pull request
Jun 23, 2022
gregcusack
pushed a commit
that referenced
this pull request
Jun 29, 2022
* add three gossip metrics measuring gossip loop times * add 5 metrics * rm space * rm space * Update SECURITY.md - fix nav link - add bounty split policy for duplicate reports * Add transaction index in slot to geyser plugin TransactionInfo (#25688) * Define shuffle to prep using same shuffle for multiple slices * Determine transaction indexes and plumb to execute_batch * Pair transaction_index with transaction in TransactionStatusService * Add new ReplicaTransactionInfoVersion * Plumb transaction_indexes through BankingStage * Prepare BankingStage to receive transaction indexes from PohRecorder * Determine transaction indexes in PohRecorder; add field to WorkingBank * Add PohRecorder::record unit test * Only pass starting_transaction_index around PohRecorder * Add helper structs to simplify test DashMap * Pass entry and starting-index into process_entries_with_callback together * Add tx-index checks to test_rebatch_transactions * Revert shuffle definition and use zip/unzip * Only zip/unzip if randomize * Add confirm_slot_entries test * Review nits * Add type alias to make sender docs more clear * Update SECURITY.md finish filling out the table.... * rpc: fix possible deadlock in rpc (#26051) * Add StatusCache::root_slot_deltas() and use it (#26170) * Remove InMemAccountsIndex::map() and use map_internal directly (#26189) * [quic]Decrement total_streams correctly (#26158) * remove comment * alphabetical metrics. no abbreviations * remove trailing white space * cargo fmt to update code format/readability Co-authored-by: Trent Nelson <trent@solana.com> Co-authored-by: Tyera Eulberg <tyera@solana.com> Co-authored-by: Boqin Qin(秦 伯钦) <Bobbqqin@gmail.com> Co-authored-by: Brooks Prumo <brooks@solana.com> Co-authored-by: Miles Obare <bdhobare@gmail.com>
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Problem
There is a possible deadlock caused by double readlock in fn
get_transaction_status.block_commitment_cacheis anArc<RwLock<...>>.The first readlock is on L1434
solana/rpc/src/rpc.rs
Lines 1434 to 1436 in fbf7143
The second readlock is on L253 in fn
banksolana/rpc/src/rpc.rs
Lines 250 to 254 in fbf7143
For more details on this kind of deadlock, see
https://www.reddit.com/r/rust/comments/urnqz8/different_behaviors_of_recursive_read_locks_in/
Summary of Changes
The fix is to move the first readlock after the calling of fn
bank.But I wonder if this is correct or optimal.
optimistically_confirmedshould be protected byblock_commitment_cache? ORr_block_commitment_cacheimmediately after the creation ofconfirmationson L1440-1448.Fixes #