Support for parsing config file at start #7399
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: Harkishen-Singh <harkishensingh@hotmail.com>
|
/cc @codesome |
codesome
reviewed
Jun 17, 2020
cmd/prometheus/main.go
Outdated
| @@ -427,6 +427,11 @@ func main() { | |||
| conntrack.DialWithTracing(), | |||
| ) | |||
|
|
|||
| if _, err := config.LoadFile(cfg.configFile); err != nil { | |||
| level.Info(logger).Log("msg", fmt.Sprintf("One or more errors exists in configuration file (--config.file=%s)", cfg.configFile)) | |||
There was a problem hiding this comment.
Suggested change
| level.Info(logger).Log("msg", fmt.Sprintf("One or more errors exists in configuration file (--config.file=%s)", cfg.configFile)) | |
| level.Error(logger).Log("msg", fmt.Sprintf("Error loading config (--config.file=%s)", cfg.configFile), "err", err) |
Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com>
|
@codesome updated. |
codesome
reviewed
Jun 17, 2020
cmd/prometheus/main.go
Outdated
| @@ -278,6 +278,11 @@ func main() { | |||
| os.Exit(2) | |||
| } | |||
|
|
|||
| if _, err := config.LoadFile(cfg.configFile); err != nil { | |||
| level.Info(logger).Log("msg", fmt.Sprintf("Error loading config (--config.file=%s)", cfg.configFile), "err", err) | |||
codesome
reviewed
Jun 17, 2020
| @@ -278,6 +278,11 @@ func main() { | |||
| os.Exit(2) | |||
| } | |||
|
|
|||
| if _, err := config.LoadFile(cfg.configFile); err != nil { | |||
| level.Info(logger).Log("msg", fmt.Sprintf("Error loading config (--config.file=%s)", cfg.configFile), "err", err) | |||
| os.Exit(2) | |||
There was a problem hiding this comment.
I am not really sure what the exit code should be. TestFailedStartupExitCode expects 1 for wrong file name. Someone aware of this can shed some light.
…o reload-config-at-start
Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com>
|
@brian-brazil @roidelapluie any views? |
| @@ -278,6 +278,11 @@ func main() { | |||
| os.Exit(2) | |||
| } | |||
|
|
|||
| if _, err := config.LoadFile(cfg.configFile); err != nil { | |||
There was a problem hiding this comment.
A comment that we're doing this so we'll fail early would be useful.
There was a problem hiding this comment.
Done. I hope that is satisfactory.
Signed-off-by: Harkishen-Singh <harkishensingh@hotmail.com>
beorn7
added a commit
that referenced
this pull request
Oct 12, 2020
In #7399, an early validity check of the config was introduced to prevent the scenario where an invalid config is only detected after a possibly very long startup procedure. However, the respective success metrics are not updated after the initial validation so that the success metrics suggest an invalid config. If the startup procedure, like replaying the WAL, really takes very long, alerts about invalid config will trigger. This commit sets the succes metrics after initial validation. They will be set again after the "real" config (re-)load, but that shouldn't be a problem. The metric now truthfully represents whenever the config was successfully loaded, no matter if the result was then thrown away (because it was just for validation) or actually used. Signed-off-by: beorn7 <beorn@grafana.com>
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.
Signed-off-by: Harkishen-Singh harkishensingh@hotmail.com
Fixes: #7322