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

filters crds values obtained through gossip by their shred version (backport #18072) #18175

Merged
merged 2 commits into from
Jun 23, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 23, 2021

This is an automatic backport of pull request #18072 done by Mergify.
Cherry-pick of 69a5f0e has failed:

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

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

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://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/

…18072)

filter_by_shred_version does not check the shred-version of the owner of
the crds-value. It only checks the shred-version of the node which is
relaying the value:
https://github.com/solana-labs/solana/blob/5cc073420/gossip/src/cluster_info.rs#L2274-L2289

So crds-values with different shred versions can still pass through this
function as long as they are relayed by a node with matching shred
version; and so, a single node can bridge different shred values
through-out the cluster.

(cherry picked from commit 69a5f0e)

# Conflicts:
#	gossip/src/cluster_info.rs
@mergify mergify bot added the conflicts label Jun 23, 2021
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 23, 2021
@codecov
Copy link

codecov bot commented Jun 23, 2021

Codecov Report

Merging #18175 (1e92b5e) into v1.7 (088b389) will decrease coverage by 0.0%.
The diff coverage is 75.9%.

@@            Coverage Diff            @@
##             v1.7   #18175     +/-   ##
=========================================
- Coverage    82.5%    82.5%   -0.1%     
=========================================
  Files         432      432             
  Lines      120645   120634     -11     
=========================================
- Hits        99574    99560     -14     
- Misses      21071    21074      +3     

@mergify mergify bot merged commit 677664e into v1.7 Jun 23, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-18072 branch June 23, 2021 17:17
@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.

1 participant