feat: swap Dashmap for StaticFileWriters on StaticFileProvider
#10089
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
mattsse
approved these changes
Aug 5, 2024
Comment on lines
23
to
29
| /// Static file writers for every known [`StaticFileSegment`]. | ||
| #[derive(Debug, Default)] | ||
| pub(crate) struct StaticFileWriters { | ||
| headers: RwLock<Option<StaticFileProviderRW>>, | ||
| transactions: RwLock<Option<StaticFileProviderRW>>, | ||
| receipts: RwLock<Option<StaticFileProviderRW>>, | ||
| } |
There was a problem hiding this comment.
ah I see this is now flattened.
imo this is a lot more readible.
shekhirin
approved these changes
Aug 5, 2024
fgimenez
approved these changes
Aug 5, 2024
joshieDo
added
the
S-blocked
|
blocking until the next release just in case |
emhane
reviewed
Aug 5, 2024
|
|
||
| fn deref(&self) -> &Self::Target { | ||
| // This is always created by [`StaticFileWriters::get_or_create`] | ||
| self.0.as_ref().expect("should exist") |
There was a problem hiding this comment.
Suggested change
| self.0.as_ref().expect("should exist") | |
| self.0.as_ref().expect("static file writer provider should be init") |
very hacky, but ok, since we don't have a trait for the static file writer providers here right, so can't do noop impl for () instead of Option<StaticFileProviderRW>.
more verbose error message helps find it in the code base though, cause this is bound to cause a bug in future when we rebuild smthg in the bootstrap process.
|
in general - good call. was thinking after #10034, that it's better not to abstract away locks anywhere in the codebase with |
joshieDo
removed
the
S-blocked
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.
Introduces:
This allows holding mutable references to two different static file segment writers without risk of deadlocking. Which is not possible with dashmap
This allows reverting #10069 .
Run the script with 0/100 failures