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

v1.18: pings received contact-infos on gossip socket address (backport of #1615) #1635

Merged
merged 2 commits into from
Jun 7, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 6, 2024

Problem

bandwidth wasted on useless contact-infos.

Summary of Changes

ping received contact-infos on gossip socket address


This is an automatic backport of pull request #1615 done by Mergify.

(cherry picked from commit 329a186)

# Conflicts:
#	gossip/src/cluster_info.rs
#	gossip/src/legacy_contact_info.rs
@mergify mergify bot requested a review from a team as a code owner June 6, 2024 19:00
@mergify mergify bot added the conflicts label Jun 6, 2024
Copy link
Author

mergify bot commented Jun 6, 2024

Cherry-pick of 329a186 has failed:

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

You are currently cherry-picking commit 329a186c50.
  (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:   gossip/src/cluster_info.rs
	both modified:   gossip/src/legacy_contact_info.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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@behzadnouri behzadnouri requested a review from gregcusack June 6, 2024 21:54
gossip/src/cluster_info.rs Show resolved Hide resolved
gossip/src/cluster_info.rs Show resolved Hide resolved
gossip/src/cluster_info.rs Show resolved Hide resolved
@behzadnouri behzadnouri requested a review from t-nelson June 6, 2024 23:33
Copy link

@t-nelson t-nelson left a comment

Choose a reason for hiding this comment

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

lgtm

Copy link

@gregcusack gregcusack left a comment

Choose a reason for hiding this comment

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

Lgtm! Thanks Behzad!

@behzadnouri behzadnouri merged commit 2bdcc83 into v1.18 Jun 7, 2024
35 checks passed
@behzadnouri behzadnouri deleted the mergify/bp/v1.18/pr-1615 branch June 7, 2024 13:22
anwayde pushed a commit to firedancer-io/agave that referenced this pull request Jul 23, 2024
…t of anza-xyz#1615) (anza-xyz#1635)

* pings received contact-infos on gossip socket address (anza-xyz#1615)

(cherry picked from commit 329a186)

# Conflicts:
#	gossip/src/cluster_info.rs
#	gossip/src/legacy_contact_info.rs

* resolves merge conflicts

---------

Co-authored-by: behzad nouri <behzadnouri@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants