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: removes lazy-static thread-pool from sigverify-shreds (backport of #30787) #30827

Merged
merged 2 commits into from
Mar 21, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 21, 2023

This is an automatic backport of pull request #30787 done by Mergify.
Cherry-pick of c6e7aaf has failed:

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

You are currently cherry-picking commit c6e7aaf96.
  (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/benches/sigverify_shreds.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/sigverify_shreds.rs
	both modified:   ledger/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

Instead the thread-pool is passed explicitly from higher in the call
stack so that
#30786
can use the same thread-pool for shred deduplication.

(cherry picked from commit c6e7aaf)

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

codecov bot commented Mar 21, 2023

Codecov Report

Merging #30827 (1cce709) into v1.14 (11a24f2) will decrease coverage by 0.1%.
The diff coverage is 84.3%.

@@            Coverage Diff            @@
##            v1.14   #30827     +/-   ##
=========================================
- Coverage    82.1%    82.0%   -0.1%     
=========================================
  Files         663      663             
  Lines      184933   184950     +17     
=========================================
- Hits       151837   151825     -12     
- Misses      33096    33125     +29     

@mergify mergify bot merged commit 2b3b4ad into v1.14 Mar 21, 2023
@mergify mergify bot deleted the mergify/bp/v1.14/pr-30787 branch March 21, 2023 18:05
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.

None yet

2 participants