fix wal config not work on config.yml #2071
Merged
Conversation
This file contains hidden or 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: Wing924 <[email protected]>
Signed-off-by: Wing924 <[email protected]>
Signed-off-by: Wing924 <[email protected]>
codesome
approved these changes
Feb 3, 2020
codesome
reviewed
Feb 3, 2020
pkg/ingester/wal.go
Outdated
| recover bool `yaml:"recover_from_wal,omitempty"` | ||
| dir string `yaml:"wal_dir,omitempty"` | ||
| checkpointDuration time.Duration `yaml:"checkpoint_duration,omitempty"` | ||
| WalEnabled bool `yaml:"wal_enabled,omitempty"` |
pracucci
approved these changes
Feb 3, 2020
CHANGELOG.md
Outdated
| @@ -10,6 +10,7 @@ | |||
| * [ENHANCEMENT] Experimental TSDB: Added dedicated flag `-experimental.tsdb.bucket-store.tenant-sync-concurrency` to configure the maximum number of concurrent tenants for which blocks are synched. #2026 | |||
| * [ENHANCEMENT] Experimental TSDB: Expose metrics for objstore operations (prefixed with `cortex_<component>_thanos_objstore_`, component being one of `ingester`, `querier` and `compactor`). #2027 | |||
| * [BUGFIX] Experimental TSDB: fixed `/all_user_stats` and `/api/prom/user_stats` endpoints when using the experimental TSDB blocks storage. #2042 | |||
| * [BUGFIX] Ingester: fixed `ingester.walconfig` not work on config.yml. #2071 | |||
There was a problem hiding this comment.
I would rephrase it to make it a bit more clear, something like:
* [BUGFIX] Fixed parsing of the WAL configuration when specified in the YAML config file. #2071
pkg/ingester/ingester.go
Outdated
| @@ -141,7 +141,7 @@ func New(cfg Config, clientConfig client.Config, limits *validation.Overrides, c | |||
| return NewV2(cfg, clientConfig, limits, registerer) | |||
| } | |||
|
|
|||
| if cfg.WALConfig.walEnabled { | |||
| if cfg.WALConfig.WalEnabled { | |||
There was a problem hiding this comment.
May you rename WalEnabled to WALEnabled , please?
pkg/ingester/wal.go
Outdated
| CheckpointEnabled bool `yaml:"checkpoint_enabled,omitempty"` | ||
| Recover bool `yaml:"recover_from_wal,omitempty"` | ||
| Dir string `yaml:"wal_dir,omitempty"` | ||
| CheckpointDuration time.Duration `yaml:"checkpoint_duration,omitempty"` | ||
| metricsRegisterer prometheus.Registerer |
There was a problem hiding this comment.
Despite correct, please also add yaml:"-" to enforce we don't want it to be configurable.
Signed-off-by: Wing924 <[email protected]>
khaines
approved these changes
Feb 4, 2020
3 tasks
pracucci
pushed a commit
to pracucci/cortex
that referenced
this pull request
Feb 5, 2020
Signed-off-by: Marco Pracucci <[email protected]>
pracucci
added a commit
that referenced
this pull request
Feb 5, 2020
Signed-off-by: Marco Pracucci <[email protected]> Co-authored-by: Wei He <[email protected]>
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: Wing924 [email protected]
What this PR does:
Fix bug:
walconfigon config file don't workYAML library use reflect to assign fields, but reflect can't access private fields.
This PR make all ingester.WALConfig public so that
walconfig.*can work without error.Which issue(s) this PR fixes:
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]