Fix possible deadlock on closing the watcher on kqueue #230
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
raw channel work (not inside a select) should always be prohibited in production code, as it readily causes deadlocks on shutdown. Also adds the test TestWatcherClose from #145. This request duplicates that test, with two lines fixed to address the houndcli-bot review concerns. Fixes #187 Fixes #145
|
Already filed out the CLA. |
nathany
approved these changes
Jan 10, 2018
aaronbee
pushed a commit
to aristanetworks/fsnotify
that referenced
this pull request
Dec 26, 2019
* avoid deadlocks on Close() raw channel work (not inside a select) should always be prohibited in production code, as it readily causes deadlocks on shutdown. Also adds the test TestWatcherClose from fsnotify#145. This request duplicates that test, with two lines fixed to address the houndcli-bot review concerns. Fixes fsnotify#187 Fixes fsnotify#145 * cleanup and simpler test * also fix fsnotify#225 * fix tests Cherry-pick of fsnotify@3d33f50
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.
if the watcher is closed from within the goroutine listening on the events or errors channel, then no one will be receiving on the events or errors channel which may lead the readEvents goroutine to block on a send to one of those channels. Then the close call on the watcher will never return because the readEvents goroutine will never receive from the done channel leading the close call to block.
This PR fixes that by using a select statement in readEvents every time it wants to send on a channel to ensure that it will also always return if the watcher is closed without a deadlock.
Thanks to @glycerine for working on this in #188.
This PR closes #188 #187 #145 #211 #225