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

chains Merkle shreds in broadcast duplicates #35058

Merged

Conversation

behzadnouri
Copy link
Contributor

@behzadnouri behzadnouri commented Feb 2, 2024

Problem

Use chained Merkle shreds in turbine/src/broadcast_stage/broadcast_duplicates_run.rs.

Summary of Changes

Chains Merkle shreds in broadcast duplicates.

@behzadnouri behzadnouri force-pushed the chained-merkle-root-duplicates branch 5 times, most recently from f60f2b9 to e993683 Compare February 6, 2024 20:07
@behzadnouri behzadnouri force-pushed the chained-merkle-root-duplicates branch from e993683 to 72bbc24 Compare February 7, 2024 16:57
@behzadnouri behzadnouri force-pushed the chained-merkle-root-duplicates branch from 72bbc24 to 107422c Compare February 7, 2024 18:44
Copy link

codecov bot commented Feb 7, 2024

Codecov Report

Attention: 13 lines in your changes are missing coverage. Please review.

Comparison is base (7a95e4f) 0.0% compared to head (107422c) 81.6%.
Report is 3 commits behind head on master.

Additional details and impacted files
@@             Coverage Diff             @@
##           master   #35058       +/-   ##
===========================================
+ Coverage        0    81.6%    +81.6%     
===========================================
  Files           0      831      +831     
  Lines           0   224845   +224845     
===========================================
+ Hits            0   183540   +183540     
- Misses          0    41305    +41305     

// Chained Merkle shreds are always discarded in epoch 0, due to
// feature_set::enable_chained_merkle_shreds. Below can be removed once
// the feature gated code is removed.
let should_chain_merkle_shreds = bank.epoch() > 0;
Copy link
Contributor

@AshwinSekar AshwinSekar Feb 7, 2024

Choose a reason for hiding this comment

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

to confirm: this was the change that now allows the local cluster tests to pass?
I took a look carl's concern here #35115 (comment) and it should not be a problem for the test, as it sends directly to the partition.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, that is correct.

@behzadnouri behzadnouri merged commit 1b9dfd4 into solana-labs:master Feb 7, 2024
35 checks passed
@behzadnouri behzadnouri deleted the chained-merkle-root-duplicates branch February 7, 2024 22:14
@behzadnouri behzadnouri added the v1.18 PRs that should be backported to v1.18 label Feb 22, 2024
Copy link
Contributor

mergify bot commented Feb 22, 2024

Backports to the beta branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule. Exceptions include CI/metrics changes, CLI improvements and documentation updates on a case by case basis.

mergify bot pushed a commit that referenced this pull request Feb 22, 2024
The commit migrates
    turbine/src/broadcast_stage/broadcast_duplicates_run.rs
to use chained Merkle shreds variant.

(cherry picked from commit 1b9dfd4)
mergify bot added a commit that referenced this pull request Feb 23, 2024
…) (#35292)

chains Merkle shreds in broadcast duplicates (#35058)

The commit migrates
    turbine/src/broadcast_stage/broadcast_duplicates_run.rs
to use chained Merkle shreds variant.

(cherry picked from commit 1b9dfd4)

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
Labels
v1.18 PRs that should be backported to v1.18
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants