Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename maintenance cycle to blocklist poll #315

Conversation

dgzlopes
Copy link
Member

@dgzlopes dgzlopes commented Nov 3, 2020

What this PR does:
Renames maintenance cycle to blocklist poll as proposed on #195 (comment)

  • s/MaintenanceCycle/BlocklistPoll/
  • s/maintenance_cycle/blocklist_poll/
  • s/DefaultMaintenanceCycle/DefaultBlocklistPoll/

Which issue(s) this PR fixes:
Fixes #198

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

- s/MaintenanceCycle/BlocklistPoll/
- s/maintenance_cycle/blocklist_poll/
- s/DefaultMaintenanceCycle/DefaultBlocklistPoll/

Signed-off-by: Daniel González Lopes <danielgonzalezlopes@gmail.com>
Signed-off-by: Daniel González Lopes <danielgonzalezlopes@gmail.com>
@@ -85,12 +85,12 @@ func (c *Config) RegisterFlagsAndApplyDefaults(prefix string, f *flag.FlagSet) {

// CheckConfig checks if config values are suspect.
func (c *Config) CheckConfig() {
if c.Ingester.CompleteBlockTimeout < c.StorageConfig.Trace.MaintenanceCycle {
if c.Ingester.CompleteBlockTimeout < c.StorageConfig.Trace.BlocklistPoll {
level.Warn(util.Logger).Log("msg", "3ingester.CompleteBlockTimeout < storage.trace.maintenance-cycle",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's a weird 3 here. let's clean that up :)

"3ingester.CompleteBlockTimeout"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch @joe-elliott! Probably some leftover from testing 😝

@joe-elliott joe-elliott merged commit 7156aa3 into grafana:master Nov 3, 2020
@dgzlopes dgzlopes deleted the rename-maintenance-cycle-to-blocklist-poll branch November 3, 2020 13:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rename Maintenance Cycle Blocklist Poll
2 participants