fix: Explicitly drop SessionFlusher #326
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
It seems that doing a thread::join from within the Drop impl of a thread local THREAD_HUB will deadlock for some reason. Explicitly joining the background flusher as part of the ClientGuard Drop does work, and is also more correct, as otherwise the PROCESS_HUB might keep the worker alive forever.
flub
approved these changes
Apr 26, 2021
| @@ -43,7 +43,7 @@ pub(crate) type TransportArc = Arc<RwLock<Option<Arc<dyn Transport>>>>; | |||
| pub struct Client { | |||
| options: ClientOptions, | |||
| transport: TransportArc, | |||
| session_flusher: SessionFlusher, | |||
| session_flusher: RwLock<Option<SessionFlusher>>, | |||
There was a problem hiding this comment.
Would it be possible to somehow leave an implementation note that explains why this is an option? If I read this correctly it only is an option because it allows you to explicitly drop the SessionFlusher on close. So this rather different from the thing being actually optional as you'd expect from an option.
There was a problem hiding this comment.
agreed. Although maybe it would be better to just make client a newtype around Option<ClientInner> or something.
There was a problem hiding this comment.
that sounds even nicer, also more work though ;)
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.
It seems that doing a thread::join from within the Drop impl of a thread
local THREAD_HUB will deadlock for some reason.
Explicitly joining the background flusher as part of the ClientGuard
Drop does work, and is also more correct, as otherwise the PROCESS_HUB
might keep the worker alive forever.
Fixes #322