gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

patches bug in recv_mmsg when npkts != nrecv

Browse Source 
If recv_mmsg receives 2 packets where the first one is filtered out,
then it returns npkts == 1:
https://github.com/solana-labs/solana/blob/01a096adc/streamer/src/recvmmsg.rs#L104-L115

But then streamer::packet::recv_from will erroneously keep the 1st
packet and drop the 2nd one:
https://github.com/solana-labs/solana/blob/01a096adc/streamer/src/packet.rs#L34-L49

To avoid this bug, this commit updates recv_mmsg to always return total
number of received packets. If socket address cannot be correctly
obtained, it is left as the default value which is UNSPECIFIED:
https://github.com/solana-labs/solana/blob/01a096adc/sdk/src/packet.rs#L145
This commit is contained in:
behzad nouri
2022-01-04 09:37:44 -05:00
parent 4b24499916
commit 379feecae5
3 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
streamer/tests/recvmmsg.rs
View File

@ -2,7 +2,7 @@
use {
solana_streamer::{
packet::{Packet, PACKET_DATA_SIZE},
packet::{Meta, Packet, PACKET_DATA_SIZE},
recvmmsg::*,
},
std::{net::UdpSocket, time::Instant},
@ -44,6 +44,9 @@ pub fn test_recv_mmsg_batch_size() {
if recv >= TEST_BATCH_SIZE {
break;
}
packets
.iter_mut()
.for_each(|pkt| pkt.meta = Meta::default());
}
elapsed_in_small_batch += now.elapsed().as_nanos();
assert_eq!(TEST_BATCH_SIZE, recv);