Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

v1.16: Update ShredFetchStage::modify_packets to drop root bank quicker (backport of #33105) #33152

Merged
merged 2 commits into from
Sep 6, 2023
Merged

v1.16: Update ShredFetchStage::modify_packets to drop root bank quicker (backport of #33105) #33152

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
263b723
Update ShredFetchStage::modify_packets to drop root bank quicker (#33…
Sep 1, 2023
94c6518
Resolve merge
Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions core/src/shred_fetch_stage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,27 @@ impl ShredFetchStage {
.as_ref()
.map(|(_, cluster_info)| cluster_info.keypair().clone());

// In the case of bank_forks=None, setup to accept any slot range
let mut root_bank = bank_forks.read().unwrap().root_bank();
let mut last_root = root_bank.slot();
let mut last_slot = std::u64::MAX;
let mut slots_per_epoch = 0;

let (mut last_root, mut last_slot, mut slots_per_epoch) = {
let bank_forks_r = bank_forks.read().unwrap();
let root_bank = bank_forks_r.root_bank();
(
root_bank.slot(),
root_bank.get_slots_in_epoch(root_bank.epoch()),
bank_forks_r.highest_slot(),
)
};
let mut stats = ShredFetchStats::default();

for mut packet_batch in recvr {
if last_updated.elapsed().as_millis() as u64 > DEFAULT_MS_PER_SLOT {
last_updated = Instant::now();
{
let root_bank = {
let bank_forks_r = bank_forks.read().unwrap();
last_root = bank_forks_r.root();
let working_bank = bank_forks_r.working_bank();
last_slot = working_bank.slot();
root_bank = bank_forks_r.root_bank();
slots_per_epoch = root_bank.get_slots_in_epoch(root_bank.epoch());
}
last_slot = bank_forks_r.highest_slot();
bank_forks_r.root_bank()
};
last_root = root_bank.slot();
slots_per_epoch = root_bank.get_slots_in_epoch(root_bank.epoch());
keypair = repair_context
.as_ref()
.map(|(_, cluster_info)| cluster_info.keypair().clone());
Expand Down