Skip to content

v3.1: turbine: Fix and cleanup redundant metric (backport of #9287) #9303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steviez merged 1 commit into from
Nov 26, 2025
Merged

v3.1: turbine: Fix and cleanup redundant metric (backport of #9287) #9303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 2 additions & 10 deletions ledger/src/shred/stats.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ impl ProcessShredsStats {
&mut self,
name: &'static str,
slot: Slot,
num_data_shreds: u32,
num_coding_shreds: u32,
slot_broadcast_time: Option<Duration>,
) {
let slot_broadcast_time = slot_broadcast_time
Expand All @@ -90,14 +88,8 @@ impl ProcessShredsStats {
("slot", slot, i64),
("shredding_time", self.shredding_elapsed, i64),
("receive_time", self.receive_elapsed, i64),
("num_data_shreds", num_data_shreds, i64),
("num_coding_shreds", num_coding_shreds, i64),
("num_merkle_data_shreds", self.num_merkle_data_shreds, i64),
(
"num_merkle_coding_shreds",
self.num_merkle_coding_shreds,
i64
),
("num_data_shreds", self.num_merkle_data_shreds, i64),
("num_coding_shreds", self.num_merkle_coding_shreds, i64),
("slot_broadcast_time", slot_broadcast_time, i64),
(
"get_leader_schedule_time",
Expand Down
32 changes: 10 additions & 22 deletions turbine/src/broadcast_stage/standard_broadcast_run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,7 @@ impl StandardBroadcastRun {
// If the current slot has changed, generates an empty shred indicating
// last shred in the previous slot, along with coding shreds for the data
// shreds buffered.
fn finish_prev_slot(
&mut self,
keypair: &Keypair,
max_ticks_in_slot: u8,
stats: &mut ProcessShredsStats,
) -> Vec<Shred> {
fn finish_prev_slot(&mut self, keypair: &Keypair, max_ticks_in_slot: u8) -> Vec<Shred> {
if self.completed {
return vec![];
}
Expand All @@ -96,9 +91,11 @@ impl StandardBroadcastRun {
self.next_shred_index,
self.next_code_index,
&self.reed_solomon_cache,
stats,
&mut self.process_shreds_stats,
)
.inspect(|shred| stats.record_shred(shred))
// These shreds will finish the slot so no need to update
// self.next_shred_index and self.next_code_index
.inspect(|shred| self.process_shreds_stats.record_shred(shred))
.collect();
if let Some(shred) = shreds.iter().max_by_key(|shred| shred.fec_set_index()) {
self.chained_merkle_root = shred.merkle_root().unwrap();
Expand Down Expand Up @@ -205,8 +202,7 @@ impl StandardBroadcastRun {
if self.slot != bank.slot() {
// Finish previous slot if it was interrupted.
if !self.completed {
let shreds =
self.finish_prev_slot(keypair, bank.ticks_per_slot() as u8, process_stats);
let shreds = self.finish_prev_slot(keypair, bank.ticks_per_slot() as u8);
debug_assert!(shreds.iter().all(|shred| shred.slot() == self.slot));
// Broadcast shreds for the interrupted slot.
let batch_info = Some(BroadcastShredBatchInfo {
Expand Down Expand Up @@ -432,13 +428,8 @@ impl StandardBroadcastRun {
)
};

self.process_shreds_stats.submit(
name,
self.slot,
self.next_shred_index, // num_data_shreds
self.next_code_index, // num_coding_shreds
slot_broadcast_time,
);
self.process_shreds_stats
.submit(name, self.slot, slot_broadcast_time);
}
}

Expand Down Expand Up @@ -578,11 +569,8 @@ mod test {
run.slot_broadcast_start = Instant::now();

// Slot 2 interrupted slot 1
let shreds = run.finish_prev_slot(
&keypair,
0, // max_ticks_in_slot
&mut ProcessShredsStats::default(),
);
let max_ticks_in_slot = 0;
let shreds = run.finish_prev_slot(&keypair, max_ticks_in_slot);
assert!(run.completed);
let shred = shreds
.first()
Expand Down
Loading