Fix promtail deadlock #5170
Merged
Fix promtail deadlock #5170
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
Signed-off-by: Christian Haudum <[email protected]>
Signed-off-by: Christian Haudum <[email protected]>
Signed-off-by: Christian Haudum <[email protected]>
cyriltovena
reviewed
Jan 18, 2022
| @@ -319,6 +319,10 @@ func (s *targetSyncer) sync(groups []*targetgroup.Group, targetEventHandler chan | |||
| target.Stop() | |||
| s.metrics.targetsActive.Add(-1.) | |||
| delete(s.targets, key) | |||
|
|
|||
| // close related file event watcher | |||
| @@ -319,6 +319,10 @@ func (s *targetSyncer) sync(groups []*targetgroup.Group, targetEventHandler chan | |||
| target.Stop() | |||
| s.metrics.targetsActive.Add(-1.) | |||
| delete(s.targets, key) | |||
|
|
|||
| // close related file event watcher | |||
| close(s.fileEventWatchers[target.path]) | |||
There was a problem hiding this comment.
To be safe, should we check that this member exists?
There was a problem hiding this comment.
Probably a good idea, on the other hand, there went something wrong beforehand if the member does not exist.
There was a problem hiding this comment.
It's the only place we don't iterate. Let's do it.
Signed-off-by: Christian Haudum <[email protected]>
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.
What this PR does / why we need it:
This PR fixes a deadlock in Promtail which occurred when targets were removed from the target groups by the discovery manager.
The problem was that upon removal of a target it was removed from the targets list, but the correlating file event watcher channel was not removed from from the watchers list. This caused events to be sent to channels that were not read any more and therefore resulting in a deadlock.
Which issue(s) this PR fixes:
Fixes #5162
Special notes for your reviewer:
Checklist
CHANGELOG.mdabout the changes.