This repository was archived by the owner on Jan 22, 2025. It is now read-only.
patches bug in recv_mmsg when npkts != nrecv (backport #22276)#22280
Merged
mergify[bot] merged 2 commits intov1.9from Jan 4, 2022
Merged
patches bug in recv_mmsg when npkts != nrecv (backport #22276)#22280mergify[bot] merged 2 commits intov1.9from
mergify[bot] merged 2 commits intov1.9from
Conversation
(cherry picked from commit 4b24499)
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 (cherry picked from commit 379feec)
mergify
Bot
added
the
automerge
Codecov Report
@@ Coverage Diff @@
## v1.9 #22280 +/- ##
=========================================
- Coverage 81.1% 81.1% -0.1%
=========================================
Files 518 518
Lines 145062 145060 -2
=========================================
- Hits 117661 117649 -12
- Misses 27401 27411 +10 |
Closed
Contributor
|
This PR has been automatically locked since there has not been any activity in past 14 days after it was merged. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #22276 done by Mergify.
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com