crates_io_worker: Replace r2d2 with deadpool
#8424
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
Turbo87
added
C-internal 🔧
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #8424 +/- ##
==========================================
- Coverage 87.62% 87.61% -0.01%
==========================================
Files 272 272
Lines 26321 26303 -18
==========================================
- Hits 23064 23046 -18
Misses 3257 3257 ☔ View full report in Codecov by Sentry. |
This comment was marked as outdated.
This comment was marked as outdated.
With the background worker ported to `deadpool` it requires one extra connection, so setting it to two connections by default isn't sufficient anymore.
LawnGnome
approved these changes
Apr 9, 2024
Comment on lines
-8
to
-22
| pub async fn spawn_blocking<F, R, E>(f: F) -> Result<R, E> | ||
| where | ||
| F: FnOnce() -> Result<R, E> + Send + 'static, | ||
| R: Send + 'static, | ||
| E: Send + From<JoinError> + 'static, | ||
| { | ||
| let current_span = tracing::Span::current(); | ||
| let hub = Hub::current(); | ||
| tokio::task::spawn_blocking(move || current_span.in_scope(|| Hub::run(hub, f))) | ||
| .await | ||
| // Convert `JoinError` to `E` | ||
| .map_err(Into::into) | ||
| // Flatten `Result<Result<_, E>, E>` to `Result<_, E>` | ||
| .and_then(std::convert::identity) | ||
| } |
There was a problem hiding this comment.
Is it wrong that I'm actually most excited by this change?
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.
While #8385 ported the individual background worker jobs from
r2d2todeadpool, this PR ports the background worker system itself to it.Note that the default
async_pool_sizefor the test suite had to be increased because the background worker system now requires us to have one more connection available.