Restart Docker target if stopped. #5280
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
Summary: The Docker target would not reconnect to a container if it restarted and kept the same ID. This should introduces a `startIfNotRunning` method that will be called to restart scraping the container's logs. Fixes grafana#5259
jeschkies
commented
Jan 31, 2022
| func (t *Target) startIfNotRunning() { | ||
| if t.running.CAS(false, true) { | ||
| ctx, cancel := context.WithCancel(context.Background()) | ||
| t.cancel = cancel |
There was a problem hiding this comment.
This is the one bit that would bother me. However, I claim it's thread safe as long as it's threadsafe to access t.cancel concurrently. It will never be nil for Stop.
dannykopping
approved these changes
Jan 31, 2022
Comment on lines
75
to
76
| t, ok := tg.targets[id] | ||
| if ok { |
There was a problem hiding this comment.
This is an opportunity to use the idiom
if t, ok := tg.targets[id]; ok {
level.Debug(tg.logger).Log("msg", "container target already exists", "container", id)
t.startIfNotRunning()
return nil
}
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:
The Docker target would not reconnect to a container if it restarted and
kept the same ID. This should introduces a
startIfNotRunningmethodthat will be called to restart scraping the container's logs.
Which issue(s) this PR fixes:
Fixes #5259
Special notes for your reviewer:
Checklist
CHANGELOG.mdabout the changes.