banking stage: actually aggregate tracer packet stats

[apfitzge]

Problem

aggregated_tracer_packet_stats_option always started off as None in this code.

Summary of Changes

The if let statement was not doing anything, so just set aggregated_tracer_packet_stats_option as the result of the recv.

Fixes #

[apfitzge]

we set aggregated_tracer_packet_stats_option to None here, and then get a new option back from recv_timeout.

[apfitzge]

this is unreachable since aggregated_tracer_packet_stats_option is None

[carllin]

hmm this seems like a bad merge, should be aggregating the new _tracer_packet_stats_option metrics read from this loop:

solana/core/src/banking_stage.rs

Lines 2017 to 2032 in a2e7bdf

	while let Ok((packet_batch, _tracer_packet_stats_option)) = verified_receiver.try_recv() {
	trace!("got more packet batches in banking stage");
	let (packets_received, packet_count_overflowed) = num_packets_received
	.overflowing_add(packet_batch.iter().map(|batch| batch.len()).sum());
	packet_batches.extend(packet_batch);
	// Spend any leftover receive time budget to greedily receive more packet batches,
	// until the upperbound of the packet count is reached.
	if start.elapsed() >= recv_timeout
	|| packet_count_overflowed
	|| packets_received >= packet_count_upperbound
	{
	break;
	}
	num_packets_received = packets_received;
	}

[apfitzge]

hmm this seems like a bad merge, should be aggregating the new _tracer_packet_stats_option metrics read from this loop:

solana/core/src/banking_stage.rs

Lines 2017 to 2032 in a2e7bdf

	while let Ok((packet_batch, _tracer_packet_stats_option)) = verified_receiver.try_recv() {
	trace!("got more packet batches in banking stage");
	let (packets_received, packet_count_overflowed) = num_packets_received
	.overflowing_add(packet_batch.iter().map(|batch| batch.len()).sum());
	packet_batches.extend(packet_batch);
	// Spend any leftover receive time budget to greedily receive more packet batches,
	// until the upperbound of the packet count is reached.
	if start.elapsed() >= recv_timeout
	|| packet_count_overflowed
	|| packets_received >= packet_count_upperbound
	{
	break;
	}
	num_packets_received = packets_received;
	}

Yeah that seems right. This first part can still assign the option like I've done here, but it'll need to be mut, and basically move the code I deleted into the loop.

Pull request has been modified.

[apfitzge]

moved the code that was above into here. Not sure if there's a better way to do this with options in rust, like:
"replace option OR do this"

[carllin]

This seems fine, thanks for the fix!