v1.18: BankingStage Forwarding Filter (backport of #685) #697

mergify · 2024-04-09T23:14:06Z

Problem

Forwarding all packets, when many will ultimately be duplicates

Summary of Changes

Only forward packets that were from staked connections (swqos)

Fixes #

This is an automatic backport of pull request #685 done by [Mergify](https://mergify.com).

mergify · 2024-04-09T23:14:08Z

Cherry-pick of 1744e9e has failed:

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

You are currently cherry-picking commit 1744e9efd7.
  (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:   bench-streamer/src/main.rs
	modified:   core/src/banking_stage/forwarder.rs
	modified:   core/src/fetch_stage.rs
	modified:   core/src/repair/ancestor_hashes_service.rs
	modified:   core/src/repair/serve_repair_service.rs
	modified:   core/src/shred_fetch_stage.rs
	modified:   gossip/src/gossip_service.rs
	modified:   local-cluster/tests/local_cluster.rs
	modified:   streamer/src/nonblocking/quic.rs
	modified:   streamer/src/streamer.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   sdk/src/packet.rs

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

codecov-commenter · 2024-04-10T04:10:35Z

Codecov Report

Attention: Patch coverage is 63.63636% with 4 lines in your changes are missing coverage. Please review.

Project coverage is 81.6%. Comparing base (cf5e8d3) to head (91bbcbb).

Additional details and impacted files

@@           Coverage Diff           @@
##            v1.18     #697   +/-   ##
=======================================
  Coverage    81.5%    81.6%           
=======================================
  Files         827      827           
  Lines      224833   224844   +11     
=======================================
+ Hits       183440   183491   +51     
+ Misses      41393    41353   -40

tao-stones

lgtm

* add PacketFlags::FROM_STAKED_NODE * Only forward packets from staked node * fix local-cluster test forwarding * review comment * tpu_votes get marked as from_staked_node (cherry picked from commit 1744e9e) # Conflicts: # sdk/src/packet.rs

t-nelson

r+ ci. only difference from previous approvals is removing test hacks in favor of a more appropriate fix in #724

tao-stones

lgtm

steviez

LGTM

behzadnouri · 2024-04-11T18:13:42Z

core/src/fetch_stage.rs

@@ -190,6 +191,7 @@ impl FetchStage {
                        coalesce,
                        true,
                        in_vote_only_mode.clone(),
+                        false, // unstaked connections


The convention is that the trailing comment should be the argument name; is_staked_service here.
This is kind of "double negative" and confusing. Does "false unstaked" mean "staked"?

there's already instances of both "explanation" style comments on bool arguments, as well as "name" style comments.

This is a backport, keep it the same as the original. If we feel strongly enough about the style we should be making modifications to master, not in a backport PR.

behzadnouri · 2024-04-11T18:15:47Z

core/src/shred_fetch_stage.rs

@@ -171,6 +171,7 @@ impl ShredFetchStage {
                    PACKET_COALESCE_DURATION,
                    true, // use_pinned_memory
                    None, // in_vote_only_mode
+                    false,


Please follow the code style.

The comments makes the life of someone reading this code a lot easier and also makes bugs/mistakes less likely.

behzadnouri · 2024-04-11T18:18:19Z

streamer/src/streamer.rs

+                    packet_batch
+                        .iter_mut()
+                        .for_each(|p| p.meta_mut().set_from_staked_node(is_staked_service));


https://rust-lang.github.io/rust-clippy/master/index.html#/needless_for_each

clippy didn't flag it, see above comment about style.

…a-xyz#697) * BankingStage Forwarding Filter (anza-xyz#685) * add PacketFlags::FROM_STAKED_NODE * Only forward packets from staked node * fix local-cluster test forwarding * review comment * tpu_votes get marked as from_staked_node (cherry picked from commit 1744e9e) # Conflicts: # sdk/src/packet.rs * resolve conflict * revert: local-cluster test changes --------- Co-authored-by: Andrew Fitzgerald <apfitzge@gmail.com> Co-authored-by: Trent Nelson <trent@solana.com>

mergify bot added the conflicts label Apr 9, 2024

mergify bot assigned apfitzge Apr 9, 2024

t-nelson requested review from sakridge and tao-stones April 10, 2024 02:25

tao-stones previously approved these changes Apr 10, 2024

View reviewed changes

sakridge previously approved these changes Apr 10, 2024

View reviewed changes

apfitzge and others added 3 commits April 10, 2024 17:18

BankingStage Forwarding Filter (#685)

bd06b20

* add PacketFlags::FROM_STAKED_NODE * Only forward packets from staked node * fix local-cluster test forwarding * review comment * tpu_votes get marked as from_staked_node (cherry picked from commit 1744e9e) # Conflicts: # sdk/src/packet.rs

resolve conflict

3b64176

revert: local-cluster test changes

91bbcbb

t-nelson dismissed stale reviews from sakridge and tao-stones via 91bbcbb April 10, 2024 23:29

t-nelson force-pushed the mergify/bp/v1.18/pr-685 branch from 69dd216 to 91bbcbb Compare April 10, 2024 23:29

t-nelson approved these changes Apr 11, 2024

View reviewed changes

apfitzge requested a review from sakridge April 11, 2024 13:46

t-nelson requested a review from steviez April 11, 2024 15:32

tao-stones approved these changes Apr 11, 2024

View reviewed changes

steviez approved these changes Apr 11, 2024

View reviewed changes

behzadnouri reviewed Apr 11, 2024

View reviewed changes

apfitzge merged commit 7e9a53e into v1.18 Apr 11, 2024
36 checks passed

apfitzge deleted the mergify/bp/v1.18/pr-685 branch April 11, 2024 21:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

v1.18: BankingStage Forwarding Filter (backport of #685) #697

v1.18: BankingStage Forwarding Filter (backport of #685) #697

mergify bot commented Apr 9, 2024

mergify bot commented Apr 9, 2024

codecov-commenter commented Apr 10, 2024 •

edited

Loading

tao-stones left a comment

t-nelson left a comment

tao-stones left a comment

steviez left a comment

behzadnouri Apr 11, 2024

apfitzge Apr 11, 2024

behzadnouri Apr 11, 2024

apfitzge Apr 11, 2024

behzadnouri Apr 11, 2024

apfitzge Apr 11, 2024

v1.18: BankingStage Forwarding Filter (backport of #685) #697

v1.18: BankingStage Forwarding Filter (backport of #685) #697

Conversation

mergify bot commented Apr 9, 2024

Problem

Summary of Changes

mergify bot commented Apr 9, 2024

codecov-commenter commented Apr 10, 2024 • edited Loading

Codecov Report

tao-stones left a comment

Choose a reason for hiding this comment

t-nelson left a comment

Choose a reason for hiding this comment

tao-stones left a comment

Choose a reason for hiding this comment

steviez left a comment

Choose a reason for hiding this comment

behzadnouri Apr 11, 2024

Choose a reason for hiding this comment

apfitzge Apr 11, 2024

Choose a reason for hiding this comment

behzadnouri Apr 11, 2024

Choose a reason for hiding this comment

apfitzge Apr 11, 2024

Choose a reason for hiding this comment

behzadnouri Apr 11, 2024

Choose a reason for hiding this comment

apfitzge Apr 11, 2024

Choose a reason for hiding this comment

codecov-commenter commented Apr 10, 2024 •

edited

Loading