Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dedups gossip addresses, taking the one with highest weight (backport #29421) #29493

Merged
merged 2 commits into from Jan 3, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 3, 2023

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

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

You are currently cherry-picking commit e5323166b.
  (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:   gossip/src/crds_gossip.rs
	modified:   gossip/src/crds_value.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gossip/src/crds_gossip_pull.rs
	both modified:   gossip/src/crds_gossip_push.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.com

dedups gossip addresses, keeping only the one with the highest weight

In order to avoid traffic congestion or sending duplicate packets, when
sampling gossip nodes if several nodes have the same gossip address
(because they are behind a relayer or whatever), they need to be
deduplicated into one.

(cherry picked from commit e532316)

# Conflicts:
#	gossip/src/crds_gossip_pull.rs
#	gossip/src/crds_gossip_push.rs
@mergify mergify bot added the conflicts label Jan 3, 2023
@behzadnouri behzadnouri removed their assignment Jan 3, 2023
@behzadnouri behzadnouri added the automerge Merge this Pull Request automatically once CI passes label Jan 3, 2023
@mergify mergify bot merged commit 69c15ab into v1.14 Jan 3, 2023
@mergify mergify bot deleted the mergify/bp/v1.14/pr-29421 branch January 3, 2023 22:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant