blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

core: fix double-readlock in replay_stage (#26052)

This commit is contained in:
Boqin Qin(秦 伯钦) 2022-08-04 22:45:31 +08:00 committed by GitHub
parent b39767193b
commit 83a0f5da0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/replay_stage.rs
View File

@ -2898,7 +2898,7 @@ impl ReplayStage {
newly_voted_pubkeys, newly_voted_pubkeys,
cluster_slot_pubkeys, cluster_slot_pubkeys,
slot, slot,
bank_forks, &bank_forks.read().unwrap(),
); );
} }
@ -3089,11 +3089,11 @@ impl ReplayStage {
mut newly_voted_pubkeys: Vec<Pubkey>, mut newly_voted_pubkeys: Vec<Pubkey>,
mut cluster_slot_pubkeys: Vec<Pubkey>, mut cluster_slot_pubkeys: Vec<Pubkey>,
fork_tip: Slot, fork_tip: Slot,
bank_forks: &RwLock<BankForks>, bank_forks: &BankForks,
) { ) {
let mut current_leader_slot = progress.get_latest_leader_slot_must_exist(fork_tip); let mut current_leader_slot = progress.get_latest_leader_slot_must_exist(fork_tip);
let mut did_newly_reach_threshold = false; let mut did_newly_reach_threshold = false;
let root = bank_forks.read().unwrap().root(); let root = bank_forks.root();
loop { loop {
// These cases mean confirmation of propagation on any earlier // These cases mean confirmation of propagation on any earlier
// leader blocks must have been reached // leader blocks must have been reached
@ -3124,8 +3124,6 @@ impl ReplayStage {
// `progress` map // `progress` map
assert!(leader_propagated_stats.is_leader_slot); assert!(leader_propagated_stats.is_leader_slot);
let leader_bank = bank_forks let leader_bank = bank_forks
.read()
.unwrap()
.get(current_leader_slot.unwrap()) .get(current_leader_slot.unwrap())
.expect("Entry in progress map must exist in BankForks") .expect("Entry in progress map must exist in BankForks")
.clone(); .clone();
@ -3414,7 +3412,7 @@ impl ReplayStage {
empty, empty,
vec![leader], vec![leader],
parent_bank.slot(), parent_bank.slot(),
bank_forks, &forks,
); );
new_banks.insert(child_slot, child_bank); new_banks.insert(child_slot, child_bank);
} }