Switch to one single runtime for S3 storage #909
Merged
Conversation
This file contains hidden or 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
Changed S3Backend::start_storage_transaction from creating a new Runtime on each call to using a lazily-initialized global runtime for all S3 instances to use. Since Tokio v0.1's Runtime has no mechanism to allow for blocking that doesn't require an &mut self, the runtime is stored inside of a mutex to allow for mutable access. We're already transitively dependent on parking_lot v0.10.2, so this is just adding it as a direct dependency (Removing tokio v0.2 will remove the other) version of parking_lot we depend on). When upgrading to tokio v0.2 this should be changed since v0.2 has the Runtime::handle method which allows runtime access from only &self.
Kixiron
added
S-waiting-on-review
jyn514
reviewed
Jul 25, 2020
src/storage/s3.rs
Outdated
|
|
||
| pub(crate) struct S3Backend { | ||
| client: S3Client, | ||
| bucket: String, | ||
| runtime: &'static Mutex<Runtime>, |
There was a problem hiding this comment.
Is there a reason to make this part of S3Backend instead of using S3_RUNTIME.lock().block_on() directly?
There was a problem hiding this comment.
It was based off of this comment
There was a problem hiding this comment.
Gotcha. Looking at the code I don't think it's actually necessary, we can change it to be a field as part of the switch to tokio 0.2 but for now I think it's more clear to use the Lazy directly.
Merged
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.
S3Backend::start_storage_transactionstop creating a newRuntimeon each callparking_lotas a direct dependency (was a transitive dependency)This should allow updating
tokioto v0.2 without the "fun little bugs" and hopefully allow async to actually be achievable