bug: Fix race in Dispatcher adding and stopping #6145
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
9f55ba3
to
4317bf6
Compare
|
My test VM was able to reproduce the race easily before. It's been running with this change for several hours and there are no orphaned worker processes. Pretty confident this is the fix. |
|
The change makes sense, though there are a couple of other places where it should be protected I believe: osquery/osquery/dispatcher/dispatcher.cpp Line 140 in e0c41f7 and osquery/osquery/include/osquery/dispatcher.h Line 165 in e6fe15e |
|
The last two places are testing related if I recall correctly. I can simplify that code and add the mutex wait. |
Smjert
approved these changes
Dec 22, 2019
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.
Fixes #6139.
We do not want to add any services after the dispatcher enters the stopping state. To accomplish this we first acquire a lock in both places then check or set the stopping state.