removes lazy-static thread-pool from sigverify-shreds #30787
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Instead the thread-pool is passed explicitly from higher in the call stack so that solana-labs#30786 can use the same thread-pool for shred deduplication.
behzadnouri
force-pushed
the
mv-sigverify-threadpool
branch
from
44b3dba
to
ed46faa
Compare
Codecov Report
@@ Coverage Diff @@
## master #30787 +/- ##
=========================================
- Coverage 81.4% 81.3% -0.1%
=========================================
Files 724 724
Lines 203081 203098 +17
=========================================
- Hits 165459 165319 -140
- Misses 37622 37779 +157 |
behzadnouri
requested review from
steviez,
bw-solana,
jbiseda,
sakridge and
t-nelson
bw-solana
reviewed
Mar 20, 2023
| @@ -121,7 +136,7 @@ fn verify_packets( | |||
| .filter_map(|(slot, pubkey)| Some((slot, pubkey?.to_bytes()))) | |||
| .chain(std::iter::once((Slot::MAX, [0u8; 32]))) | |||
| .collect(); | |||
| let out = verify_shreds_gpu(packets, &leader_slots, recycler_cache); | |||
| let out = verify_shreds_gpu(thread_pool, packets, &leader_slots, recycler_cache); | |||
There was a problem hiding this comment.
Passing CPU thread pool into verify_shreds_gpu .. barf.
By the way, not blaming you for the precedent that was already here.
There was a problem hiding this comment.
at least the grossness is out in the open now, rather than hidden away tidily behind that global 😉
bw-solana
reviewed
Mar 20, 2023
| @@ -284,7 +299,9 @@ mod tests { | |||
| batches[0][1].buffer_mut()[..shred.payload().len()].copy_from_slice(shred.payload()); | |||
| batches[0][1].meta_mut().size = shred.payload().len(); | |||
|
|
|||
| let thread_pool = ThreadPoolBuilder::new().num_threads(3).build().unwrap(); | |||
There was a problem hiding this comment.
It is a test; so I just picked some small number.
t-nelson
approved these changes
Mar 20, 2023
| @@ -121,7 +136,7 @@ fn verify_packets( | |||
| .filter_map(|(slot, pubkey)| Some((slot, pubkey?.to_bytes()))) | |||
| .chain(std::iter::once((Slot::MAX, [0u8; 32]))) | |||
| .collect(); | |||
| let out = verify_shreds_gpu(packets, &leader_slots, recycler_cache); | |||
| let out = verify_shreds_gpu(thread_pool, packets, &leader_slots, recycler_cache); | |||
There was a problem hiding this comment.
at least the grossness is out in the open now, rather than hidden away tidily behind that global 😉
mergify bot
added a commit
that referenced
this pull request
Mar 21, 2023
…t of #30787) (#30827) * removes lazy-static thread-pool from sigverify-shreds (#30787) 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 * resolves mergify merge conflicts --------- Co-authored-by: behzad nouri <behzadnouri@gmail.com>
behzadnouri
added a commit
to behzadnouri/solana
that referenced
this pull request
Mar 21, 2023
…t of solana-labs#30787) removes lazy-static thread-pool from sigverify-shreds solana-labs#30787 Instead the thread-pool is passed explicitly from higher in the call stack so that solana-labs#30786 can use the same thread-pool for shred deduplication. (cherry picked from commit c6e7aaf)
behzadnouri
added a commit
to behzadnouri/solana
that referenced
this pull request
Mar 21, 2023
…t of solana-labs#30787) removes lazy-static thread-pool from sigverify-shreds solana-labs#30787 Instead the thread-pool is passed explicitly from higher in the call stack so that solana-labs#30786 can use the same thread-pool for shred deduplication. (cherry picked from commit c6e7aaf)
behzadnouri
added a commit
to behzadnouri/solana
that referenced
this pull request
Mar 21, 2023
…t of solana-labs#30787) removes lazy-static thread-pool from sigverify-shreds solana-labs#30787 Instead the thread-pool is passed explicitly from higher in the call stack so that solana-labs#30786 can use the same thread-pool for shred deduplication. (cherry picked from commit c6e7aaf)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
The lazy-static thread-pool is not accessible from outside the
ledger/src/sigverfiy_shreds.rsfile.Summary of Changes
The commit passes the thread-pool explicitly from higher in the call stack so that #30786 can use the same thread-pool for shred deduplication.