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

skips bad addresses before sending packets (backport #18728) #18740

Merged
merged 1 commit into from
Jul 17, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 17, 2021

This is an automatic backport of pull request #18728 done by Mergify.
Cherry-pick of e316586 has failed:

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

You are currently cherry-picking commit e31658651.
  (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)

Changes to be committed:
	modified:   gossip/src/contact_info.rs
	modified:   streamer/src/lib.rs
	modified:   streamer/src/packet.rs
	new file:   streamer/src/socket.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/broadcast_stage.rs
	both modified:   gossip/src/cluster_info.rs

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.io/

@mergify mergify bot added the conflicts label Jul 17, 2021
@t-nelson t-nelson force-pushed the mergify/bp/v1.7/pr-18728 branch from 995e6e2 to 92ad726 Compare July 17, 2021 02:24
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 17, 2021
Comment on lines -400 to +404
Some((&shred.payload, &node.tvu))
if is_global(&node.tvu) {
Some((&shred.payload, &node.tvu))
} else {
None
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@behzadnouri and this one 🙏

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good, thank you again

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jul 17, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 17, 2021

automerge label removed due to a CI failure

(cherry picked from commit e316586)

# Conflicts:
#	core/src/broadcast_stage.rs
#	gossip/src/cluster_info.rs
@t-nelson t-nelson force-pushed the mergify/bp/v1.7/pr-18728 branch from 92ad726 to 1806c9b Compare July 17, 2021 02:33
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 17, 2021
@codecov
Copy link

codecov bot commented Jul 17, 2021

Codecov Report

Merging #18740 (1806c9b) into v1.7 (98658eb) will decrease coverage by 0.0%.
The diff coverage is 82.6%.

@@            Coverage Diff            @@
##             v1.7   #18740     +/-   ##
=========================================
- Coverage    82.3%    82.3%   -0.1%     
=========================================
  Files         433      434      +1     
  Lines      122596   122608     +12     
=========================================
+ Hits       100928   100929      +1     
- Misses      21668    21679     +11     

@mergify mergify bot merged commit df9061b into v1.7 Jul 17, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-18728 branch July 17, 2021 04:10
ryoqun added a commit to ryoqun/solana that referenced this pull request Jul 21, 2021
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants