Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Flip iter operations to keep associated address/header/packets together (backport #22245) #22256

Merged
merged 2 commits into from
Jan 4, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 3, 2022

This is an automatic backport of pull request #22245 done by Mergify.
Cherry-pick of 20b61e2 has failed:

On branch mergify/bp/v1.8/pr-22245
Your branch is up to date with 'origin/v1.8'.

You are currently cherry-picking commit 20b61e28b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   streamer/src/recvmmsg.rs

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


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 refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…er (#22245)

Flip iter operations to keep associated address/header/packets together

Before this change, if cast_socket_addr() returned a None for any
address/header pair, the subsequent zip() would misalign the
address/header pair and packet. So, this change zips all three together,
then does filter_map() so keep things aligned.

Additionally, compute total_size inline to avoid running through packets
a second time.

(cherry picked from commit 20b61e2)

# Conflicts:
#	streamer/src/recvmmsg.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Jan 3, 2022
@solana-grimes
Copy link
Contributor

😱 New commits were pushed while the automerge label was present.

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jan 3, 2022
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jan 3, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jan 4, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 4, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jan 4, 2022

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jan 4, 2022
@behzadnouri behzadnouri force-pushed the mergify/bp/v1.8/pr-22245 branch from a0d29fd to f46f54a Compare January 4, 2022 13:58
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 4, 2022
@codecov
Copy link

codecov bot commented Jan 4, 2022

Codecov Report

Merging #22256 (f46f54a) into v1.8 (84d535b) will decrease coverage by 0.0%.
The diff coverage is 100.0%.

@@            Coverage Diff            @@
##             v1.8   #22256     +/-   ##
=========================================
- Coverage    81.6%    81.5%   -0.1%     
=========================================
  Files         459      459             
  Lines      131039   131034      -5     
=========================================
- Hits       106934   106912     -22     
- Misses      24105    24122     +17     

@mergify mergify bot merged commit 7b9ca3e into v1.8 Jan 4, 2022
@mergify mergify bot deleted the mergify/bp/v1.8/pr-22245 branch January 4, 2022 16:34
@github-actions
Copy link
Contributor

github-actions bot commented Apr 2, 2022

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 2, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts locked PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants