sidecar: wait on ext labels before uploading #1287
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
bwplotka
approved these changes
Jun 28, 2019
cmd/thanos/sidecar.go
Outdated
| @@ -248,6 +248,17 @@ func runSidecar( | |||
| g.Add(func() error { | |||
| defer runutil.CloseWithLogOnErr(logger, bkt, "bucket client") | |||
|
|
|||
| extLabelsTimeout := 2 * time.Minute | |||
There was a problem hiding this comment.
Not sure if 2 min is ok, maybe worth to increase or expose via flag?
There was a problem hiding this comment.
Yeah fair point. I've increased it, quite a lot actually to 10 minutes. We should probably be conservative here (don't want to kill anything we shouldn't) and I'd rather avoid a flag if possible. Feel free to adjust the value though, I might be missing some context on startup times :)
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.
Addresses #1239 by adding a step that will force a wait on external labels before starting the shipper (when upload is enabled).
Note that the case of
len(m.Labels())is already checked in the sidecar when it initially syncs with Prom. However, we don't currently hard-fail iflen(m.Labels())==0as we retry indefinitely. With this PR, we would now hard-fail in that case (after 2 minutes).