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

v1.14: moves shreds deduper to shred-sigverify stage (backport of #30786) #30861

Merged
merged 2 commits into from
Mar 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 22, 2023

This is an automatic backport of pull request #30786 done by Mergify.
Cherry-pick of 25b7811 has failed:

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

You are currently cherry-picking commit 25b781186.
  (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:   ledger/src/shred/stats.rs

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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.com

Shreds arriving at tvu/tvu_forward/repair sockets are each processed in
a separate thread, and since each thread has its own deduper, the
duplicates across these sockets are not filtered out.
Using a common deduper across these threads will require an RwLock
wrapper and may introduce lock contention.
The commit instead moves the shred-deduper to shred-sigverify-stage
where all these shreds arrive through the same channel.

(cherry picked from commit 25b7811)

# Conflicts:
#	core/src/shred_fetch_stage.rs
#	core/src/sigverify_shreds.rs
@behzadnouri behzadnouri added the automerge Merge this Pull Request automatically once CI passes label Mar 22, 2023
@codecov
Copy link

codecov bot commented Mar 22, 2023

Codecov Report

Merging #30861 (e205692) into v1.14 (5fdbf28) will decrease coverage by 0.1%.
The diff coverage is 56.0%.

@@            Coverage Diff            @@
##            v1.14   #30861     +/-   ##
=========================================
- Coverage    82.1%    82.1%   -0.1%     
=========================================
  Files         663      663             
  Lines      184975   184964     -11     
=========================================
- Hits       151894   151869     -25     
- Misses      33081    33095     +14     

@mergify mergify bot merged commit f1ccc41 into v1.14 Mar 22, 2023
@mergify mergify bot deleted the mergify/bp/v1.14/pr-30786 branch March 22, 2023 23:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants