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

removes port-based forwarding logic from turbine retransmit (backport #17716) #17973

Merged
merged 1 commit into from
Jun 15, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 15, 2021

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


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/

Turbine retransmit logic is based on which socket it received the packet
from (i.e `packet.meta.forward`):
https://github.com/solana-labs/solana/blob/708bbcb00/core/src/retransmit_stage.rs#L467-L470

This can leave the cluster vulnerable to spoofing and selective
propagation of packets; see
#6672
#7774

This commit identifies if the node is on the "critical path" based on
its index in the shuffled cluster. If so, it forwards the packet to both
neighbors and children; otherwise, the packet is only forwarded to the
children.

The metrics added in
#17351
shows that the number of times the index does not match the port is very
rare, and therefore this change should be safe.

(cherry picked from commit 1618386)
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 15, 2021
@codecov
Copy link

codecov bot commented Jun 15, 2021

Codecov Report

Merging #17973 (1cb6331) into v1.7 (991f99b) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##             v1.7   #17973   +/-   ##
=======================================
  Coverage    82.4%    82.4%           
=======================================
  Files         428      428           
  Lines      120230   120240   +10     
=======================================
+ Hits        99175    99186   +11     
+ Misses      21055    21054    -1     

@mergify mergify bot merged commit ef20559 into v1.7 Jun 15, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-17716 branch June 15, 2021 15:25
@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant