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

patches bug in banking stage where buffered packets are never retained (#16276) 

banking_stage::handle_forwarding is retaining buffered packets with
empty index, so nothing is held:
https://github.com/solana-labs/solana/blob/6f3926b64/core/src/banking_stage.rs#L520
This commit is contained in:
behzad nouri 2021-04-05 12:46:21 +00:00 committed by GitHub
parent b521f50278
commit 701fc93343
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
core/src/banking_stage.rs
View File

@ -503,29 +503,30 @@ impl BankingStage {
socket: &UdpSocket,
hold: bool,
) {
if enable_forwarding {
let next_leader = poh_recorder
.lock()
.unwrap()
.leader_after_n_slots(FORWARD_TRANSACTIONS_TO_LEADER_AT_SLOT_OFFSET);
next_leader.map_or((), |leader_pubkey| {
let leader_addr = {
cluster_info.lookup_contact_info(&leader_pubkey, |leader| leader.tpu_forwards)
};
leader_addr.map_or((), |leader_addr| {
let _ =
Self::forward_buffered_packets(&socket, &leader_addr, &buffered_packets);
if hold {
buffered_packets.retain(|b| b.1.is_empty());
for b in buffered_packets.iter_mut() {
b.2 = true;
}
} else {
buffered_packets.clear();
}
})
})
if !enable_forwarding {
if !hold {
buffered_packets.clear();
}
return;
}
let next_leader = match poh_recorder
.lock()
.unwrap()
.leader_after_n_slots(FORWARD_TRANSACTIONS_TO_LEADER_AT_SLOT_OFFSET)
{
Some(pubkey) => pubkey,
None => return,
};
let addr = match cluster_info.lookup_contact_info(&next_leader, |ci| ci.tpu_forwards) {
Some(addr) => addr,
None => return,
};
let _ = Self::forward_buffered_packets(socket, &addr, buffered_packets);
if hold {
buffered_packets.retain(|(_, index, _)| !index.is_empty());
for (_, _, forwarded) in buffered_packets.iter_mut() {
*forwarded = true;
}
} else {
buffered_packets.clear();
}