Skip to content
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

Jump to bottom

Add PacketBatch packet_indexes stat #22564

Merged
merged 5 commits into from Jan 19, 2022
Merged

Add PacketBatch packet_indexes stat #22564

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65a1106
collect stats on packet batch indicies
Jan 18, 2022
50e5268
cleanup
Jan 18, 2022
4b827d2
cleanup
Jan 18, 2022
3369d6d
cleanup
Jan 18, 2022
7d20f89
change name
Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
52 changes: 42 additions & 10 deletions core/src/banking_stage.rs
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@
use {
crate::{packet_deduper::PacketDeduper, qos_service::QosService},
crossbeam_channel::{Receiver as CrossbeamReceiver, RecvTimeoutError},
histogram::Histogram,
itertools::Itertools,
retain_mut::RetainMut,
solana_entry::entry::hash_transactions,
Expand Down Expand Up @@ -95,6 +96,7 @@ pub struct BankingStageStats {
current_buffered_packet_batches_count: AtomicUsize,
rebuffered_packets_count: AtomicUsize,
consumed_buffered_packets_count: AtomicUsize,
packet_batch_indices_len: Histogram,
buffalu marked this conversation as resolved.
Show resolved Hide resolved

// Timing
consume_buffered_packets_elapsed: AtomicU64,
Expand All @@ -111,6 +113,10 @@ impl BankingStageStats {
pub fn new(id: u32) -> Self {
BankingStageStats {
id,
packet_batch_indices_len: Histogram::configure()
.max_value(PACKETS_PER_BATCH as u64)
.build()
.unwrap(),
..BankingStageStats::default()
}
}
Expand Down Expand Up @@ -147,9 +153,10 @@ impl BankingStageStats {
.unprocessed_packet_conversion_elapsed
.load(Ordering::Relaxed)
+ self.transaction_processing_elapsed.load(Ordering::Relaxed)
+ self.packet_batch_indices_len.entries()
}

fn report(&self, report_interval_ms: u64) {
fn report(&mut self, report_interval_ms: u64) {
// skip repoting metrics if stats is empty
if self.is_empty() {
return;
Expand Down Expand Up @@ -255,7 +262,28 @@ impl BankingStageStats {
.swap(0, Ordering::Relaxed) as i64,
i64
),
(
"packet_batch_indices_len_min",
self.packet_batch_indices_len.minimum().unwrap_or(0) as i64,
i64
),
(
"packet_batch_indices_len_max",
self.packet_batch_indices_len.maximum().unwrap_or(0) as i64,
i64
),
(
"packet_batch_indices_len_mean",
self.packet_batch_indices_len.mean().unwrap_or(0) as i64,
i64
),
(
"packet_batch_indices_len_90pct",
self.packet_batch_indices_len.percentile(90.0).unwrap_or(0) as i64,
i64
)
);
self.packet_batch_indices_len.clear();
}
}
}
Expand Down Expand Up @@ -734,7 +762,7 @@ impl BankingStage {
let recorder = poh_recorder.lock().unwrap().recorder();
let socket = UdpSocket::bind("0.0.0.0:0").unwrap();
let mut buffered_packet_batches = VecDeque::with_capacity(batch_limit);
let banking_stage_stats = BankingStageStats::new(id);
let mut banking_stage_stats = BankingStageStats::new(id);
buffalu marked this conversation as resolved.
Show resolved Hide resolved
let qos_service = QosService::new(cost_model, id);
loop {
let my_pubkey = cluster_info.id();
Expand Down Expand Up @@ -779,7 +807,7 @@ impl BankingStage {
id,
batch_limit,
&mut buffered_packet_batches,
&banking_stage_stats,
&mut banking_stage_stats,
packet_deduper,
) {
Ok(()) | Err(RecvTimeoutError::Timeout) => (),
Expand Down Expand Up @@ -1384,7 +1412,7 @@ impl BankingStage {
id: u32,
batch_limit: usize,
buffered_packet_batches: &mut UnprocessedPacketBatches,
banking_stage_stats: &BankingStageStats,
banking_stage_stats: &mut BankingStageStats,
packet_deduper: &PacketDeduper,
) -> Result<(), RecvTimeoutError> {
let mut recv_time = Measure::start("receive_and_buffer_packets_recv");
Expand Down Expand Up @@ -1468,7 +1496,7 @@ impl BankingStage {
newly_buffered_packets_count: &mut usize,
batch_limit: usize,
packet_deduper: &PacketDeduper,
banking_stage_stats: &BankingStageStats,
banking_stage_stats: &mut BankingStageStats,
) {
packet_deduper.dedupe_packets(&packet_batch, &mut packet_indexes, banking_stage_stats);
if Self::packet_has_more_unprocessed_transactions(&packet_indexes) {
Expand All @@ -1478,6 +1506,10 @@ impl BankingStage {
*dropped_packets_count += dropped_batch.1.len();
}
}
let _ = banking_stage_stats
.packet_batch_indices_len
.increment(packet_indexes.len() as u64);

*newly_buffered_packets_count += packet_indexes.len();
unprocessed_packet_batches.push_back((packet_batch, packet_indexes, false));
}
Expand Down Expand Up @@ -3209,7 +3241,7 @@ mod tests {
let mut dropped_packet_batches_count = 0;
let mut dropped_packets_count = 0;
let mut newly_buffered_packets_count = 0;
let banking_stage_stats = BankingStageStats::default();
let mut banking_stage_stats = BankingStageStats::default();
// Because the set of unprocessed `packet_indexes` is empty, the
// packets are not added to the unprocessed queue
BankingStage::push_unprocessed(
Expand All @@ -3221,7 +3253,7 @@ mod tests {
&mut newly_buffered_packets_count,
batch_limit,
&packet_deduper,
&banking_stage_stats,
&mut banking_stage_stats,
);
assert_eq!(unprocessed_packets.len(), 1);
assert_eq!(dropped_packet_batches_count, 0);
Expand All @@ -3240,7 +3272,7 @@ mod tests {
&mut newly_buffered_packets_count,
batch_limit,
&packet_deduper,
&banking_stage_stats,
&mut banking_stage_stats,
);
assert_eq!(unprocessed_packets.len(), 2);
assert_eq!(dropped_packet_batches_count, 0);
Expand All @@ -3264,7 +3296,7 @@ mod tests {
&mut newly_buffered_packets_count,
batch_limit,
&packet_deduper,
&banking_stage_stats,
&mut banking_stage_stats,
);
assert_eq!(unprocessed_packets.len(), 2);
assert_eq!(
Expand All @@ -3285,7 +3317,7 @@ mod tests {
&mut newly_buffered_packets_count,
3,
&packet_deduper,
&banking_stage_stats,
&mut banking_stage_stats,
);
assert_eq!(unprocessed_packets.len(), 2);
assert_eq!(
Expand Down