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

adds shred-version to ip-echo-server response (backport #18066) #18113

Merged
merged 3 commits into from
Jun 21, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 21, 2021

This is an automatic backport of pull request #18066 done by Mergify.
Cherry-pick of 598093b has failed:

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

You are currently cherry-picking commit 598093b5d.
  (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:   core/src/validator.rs
	modified:   gossip/src/gossip_service.rs
	modified:   net-utils/src/bin/ip_address_server.rs
	modified:   net-utils/src/ip_echo_server.rs
	modified:   net-utils/src/lib.rs
	modified:   validator/src/main.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   net-utils/Cargo.toml
	both modified:   programs/bpf/Cargo.lock

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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/

When starting a validator, the node initially joins gossip with
shred_verison = 0, until it adopts the entrypoint's shred-version:
https://github.com/solana-labs/solana/blob/9b182f408/validator/src/main.rs#L417

Depending on the load on the entrypoint, this adopting entrypoint
shred-version through gossip sometimes becomes very slow, and causes
several problems in gossip because we have to partially support
shred_version == 0 which is a source of leaking crds values from one
cluster to another. e.g. see
#17899
and the other linked issues there.

In order to remove shred_version == 0 from gossip, this commit adds
shred-version to ip-echo-server response. Once the entrypoints are
updated, on validator start-up, if --expected_shred_version is not
specified we will obtain shred-version from the entrypoint using
ip-echo-server.

(cherry picked from commit 598093b)

# Conflicts:
#	Cargo.lock
#	net-utils/Cargo.toml
#	programs/bpf/Cargo.lock
@mergify mergify bot added the conflicts label Jun 21, 2021
@behzadnouri behzadnouri force-pushed the mergify/bp/v1.7/pr-18066 branch from 8110183 to e9f8642 Compare June 21, 2021 20:01
@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 Jun 21, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 21, 2021

automerge label removed due to a CI failure

@codecov
Copy link

codecov bot commented Jun 21, 2021

Codecov Report

Merging #18113 (e9f8642) into v1.7 (97a7f74) will increase coverage by 0.0%.
The diff coverage is 98.5%.

@@           Coverage Diff           @@
##             v1.7   #18113   +/-   ##
=======================================
  Coverage    82.5%    82.5%           
=======================================
  Files         432      432           
  Lines      120342   120392   +50     
=======================================
+ Hits        99342    99392   +50     
  Misses      21000    21000           

@behzadnouri behzadnouri merged commit 363b756 into v1.7 Jun 21, 2021
@behzadnouri behzadnouri deleted the mergify/bp/v1.7/pr-18066 branch June 21, 2021 23:04
@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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant