telemetryhook gets stuck during shutdown#888
Merged
tsachiherman merged 2 commits intoalgorand:masterfrom Mar 19, 2020
Merged
Conversation
When the elasticHook returns an error, asyncTelemetryHook will not change to ready state. Consequently, the elements will get stuck in the channel and the buffer. The waitGroup associated with these elements, will prevent the telemetry from quitting. This PR stops waiting for these elements.
algobolson
reviewed
Mar 4, 2020
| func (hook *asyncTelemetryHook) Fire(entry *logrus.Entry) error { | ||
| hook.wg.Add(1) | ||
| select { | ||
| case <-hook.quit: |
Contributor
There was a problem hiding this comment.
this case should have a hook.wg.Done() ? otherwise where is the .Add(1) consumed?
Contributor
Author
There was a problem hiding this comment.
Yes. thanks for catching this.
pzbitskiy
reviewed
Mar 5, 2020
Contributor
pzbitskiy
left a comment
pzbitskiy
left a comment
There was a problem hiding this comment.
It looks OK fix but the question is why is there so many wg.Add and quite a little goroutines? Can't it be simplified and rely only on channels ?
winder
reviewed
Mar 11, 2020
| for moreEntries { | ||
| select { | ||
| case entry := <-hook.entries: | ||
| hook.appendEntry(entry) |
Contributor
There was a problem hiding this comment.
I don't think you need to call appendEntry, call hook.wg.Done() and skip the range below
Contributor
Author
There was a problem hiding this comment.
At this point, there may or may not be elements in hook.pending.
For every element in hook.entries and hook.pending, there should be a hook.wg.Done()
So, there needs to be two range loops to achieve this.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Summary
When the elasticHook returns an error, asyncTelemetryHook will not change to ready state.
Consequently, the elements will get stuck in the channel and the buffer.
The waitGroup associated with these elements, will prevent the telemetry from quitting.
This PR stops waiting for these elements.