Stop counterCache only when already started #19103
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
Signed-off-by: chrismark <[email protected]>
ChrsMark
added
bug
review
needs_backport
botelastic
bot
added
the
needs_team
|
Pinging @elastic/integrations-platforms (Team:Platforms) |
botelastic
bot
removed
the
needs_team
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
|
Signed-off-by: chrismark <[email protected]>
Signed-off-by: chrismark <[email protected]>
Signed-off-by: chrismark <[email protected]>
Signed-off-by: chrismark <[email protected]>
Signed-off-by: chrismark <[email protected]>
|
@exekias I think this is ready for a review ;), let me know what you think. |
exekias
reviewed
Jun 16, 2020
Comment on lines
197
to
206
| attempts := 0 | ||
| for !m.eventGenStarted { | ||
| time.Sleep(m.period) | ||
| // waiting 2 periods so as the first Fetch to start the generator, otherwise return since | ||
| // Fetch is not called at all | ||
| if attempts > 2 { | ||
| return nil | ||
| } | ||
| attempts++ | ||
| } |
There was a problem hiding this comment.
I don't think you need a backoff here. MB will make sure Fetch is not called after Close. This could just be:
if !m.eventGenStarted {
m.promEventsGen.Stop()
}
Signed-off-by: chrismark <[email protected]>
jsoriano
reviewed
Jun 16, 2020
Signed-off-by: chrismark <[email protected]>
Signed-off-by: chrismark <[email protected]>
exekias
approved these changes
Jun 17, 2020
jsoriano
approved these changes
Jun 17, 2020
ChrsMark
added a commit
to ChrsMark/beats
that referenced
this pull request
Jun 17, 2020
(cherry picked from commit 4a45bb4)
ChrsMark
removed
the
needs_backport
ChrsMark
added a commit
that referenced
this pull request
Jun 24, 2020
melchiormoulin
pushed a commit
to melchiormoulin/beats
that referenced
this pull request
Oct 14, 2020
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 does this PR do?
Adds a better handling for
counterCachestop in order to avoid trying to stop a Janitor that is not yet started which will lead topanicerrors. This will happen in cases where the Metricset is stopped before the first Fetch is called and hence the generator is not yet started:beats/metricbeat/module/prometheus/collector/collector.go
Line 129 in 3ebceec
In order to handle this properly we wait 2 periods (the fetching period of the metricset) until we try to stop the counterCache. If after 2 periods the generator is not marked as started then we just return in
Stopwithout stoping the counterCache since this indicates that the metricset was stoped before the firstFetch.Why is it important?
To avoid having panic crashes on Autodiscover scenarios.
Related issues