Make config reloader file writes atomic #962
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
This addresses an issue found in the Prometheus Operator, which reuses this reloader sidecar, but which then also has a second sidecar which may trigger rule-based reloads while the config sidecar is in the middle of writing out its config (in a non-atomic way): prometheus-operator/prometheus-operator#2501 I didn't add a test for this because it's hard to catch the original problem to begin with, but it has happened. Signed-off-by: Julius Volz <[email protected]>
|
CI fails with: @juliusv I suspect you verified that the normal flow of the reloader works with this change? |
|
I guess errcheck is a bit aggressive here, as the |
|
Its definitely not aggressive (: it's just a matter of being explicit when you don't need error by doing: |
Signed-off-by: Julius Volz <[email protected]>
|
I added an explicit error ignore now.
Nope :) Not beyond the existing test suite at least. |
bwplotka
approved these changes
Mar 22, 2019
pkg/reloader/reloader.go
Outdated
| @@ -199,9 +199,14 @@ func (r *Reloader) apply(ctx context.Context) error { | |||
| return errors.Wrap(err, "expand environment variables") | |||
| } | |||
|
|
|||
| if err := ioutil.WriteFile(r.cfgOutputFile, b, 0666); err != nil { | |||
| tmpFile := r.cfgOutputFile + ".tmp" | |||
| defer os.Remove(tmpFile) | |||
There was a problem hiding this comment.
You can satisfy errcheck by
defer func(){ _ := os.Remove(tmpFile) }()
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.
This addresses an issue found in the Prometheus Operator, which reuses
this reloader sidecar, but which then also has a second sidecar which
may trigger rule-based reloads while the config sidecar is in the middle
of writing out its config (in a non-atomic way):
prometheus-operator/prometheus-operator#2501
I didn't add a test for this because it's hard to catch the original
problem to begin with, but it has happened.
Signed-off-by: Julius Volz [email protected]