[bloom-compactor] Add configs to enable compactor per tenant #11235
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
|
Trivy scan found the following vulnerabilities:
|
github-actions
bot
added
the
type/docs
salvacorts
reviewed
Nov 15, 2023
pkg/bloomcompactor/bloomcompactor.go
Outdated
| @@ -559,6 +559,10 @@ func (c *Compactor) runCompact(ctx context.Context, logger log.Logger, job Job, | |||
| return err | |||
| } | |||
|
|
|||
| if !c.limits.BloomCompactorEnabled(job.tenantID) { | |||
There was a problem hiding this comment.
I think this limit should be applied inside the loop over tenants in compactUsers. The limit should probably just print a warning (even info?) message and continue to the next tenant. This way you also skip doing a bunch of work for the tenant.
There was a problem hiding this comment.
Yeah i was torn in between, happy to move there.
| @@ -301,6 +302,7 @@ func (l *Limits) RegisterFlags(f *flag.FlagSet) { | |||
| f.IntVar(&l.BloomCompactorShardSize, "bloom-compactor.shard-size", 1, "The shard size defines how many bloom compactors should be used by a tenant when computing blooms. If it's set to 0, shuffle sharding is disabled.") | |||
| f.DurationVar(&l.BloomCompactorMaxTableAge, "bloom-compactor.max-table-age", 7*24*time.Hour, "The maximum age of a table before it is compacted. Do not compact tables older than the the configured time. Default to 7 days. 0s means no limit.") | |||
| f.DurationVar(&l.BloomCompactorMinTableAge, "bloom-compactor.min-table-age", 1*time.Hour, "The minimum age of a table before it is compacted. Do not compact tables newer than the the configured time. Default to 1 hour. 0s means no limit. This is useful to avoid compacting tables that will be updated with out-of-order writes.") | |||
| f.BoolVar(&l.BloomCompactorEnabled, "bloom-compactor.enable-compaction", false, "Whether to compact chunks into bloom filters.") | |||
There was a problem hiding this comment.
IIUC we want this to be false by default at the beginning so we selectively enable it for testing, right?
But eventually, this will be true by default. Wondering because the log line about skipping the tenant can get a bit noisy.
There was a problem hiding this comment.
Yes correct, we want to selectively enable at first. Probably true for large cells, but i don't think for dev.
We can cross that bridge then?
salvacorts
reviewed
Nov 15, 2023
pkg/bloomcompactor/bloomcompactor.go
Outdated
| @@ -293,6 +293,11 @@ func (c *Compactor) compactUsers(ctx context.Context, logger log.Logger, sc stor | |||
| return fmt.Errorf("interrupting compaction of tenants: %w", err) | |||
| } | |||
|
|
|||
| // Skip tenant if compaction is not enabled | |||
| if !c.limits.BloomCompactorEnabled(tenant) { | |||
| return level.Info(tenantLogger).Log("msg", "compaction disabled for tenant") | |||
There was a problem hiding this comment.
I think this should be
Suggested change
| return level.Info(tenantLogger).Log("msg", "compaction disabled for tenant") | |
| level.Info(tenantLogger).Log("msg", "compaction disabled for tenant. Skipping.") | |
| continue |
There was a problem hiding this comment.
oof end of day silliness. sorry
chaudum
reviewed
Nov 15, 2023
pkg/bloomcompactor/bloomcompactor.go
Outdated
| @@ -293,6 +293,11 @@ func (c *Compactor) compactUsers(ctx context.Context, logger log.Logger, sc stor | |||
| return fmt.Errorf("interrupting compaction of tenants: %w", err) | |||
| } | |||
|
|
|||
| // Skip tenant if compaction is not enabled | |||
| if !c.limits.BloomCompactorEnabled(tenant) { | |||
| return level.Info(tenantLogger).Log("msg", "compaction disabled for tenant") | |||
There was a problem hiding this comment.
Not sure about returning the return value of Log().
While it works perfectly fine, I think writing the return in a separate line looks cleaner.
There was a problem hiding this comment.
it wasn't suppose to end the loop for this. it has a continue on a separate line now.
chaudum
approved these changes
Nov 15, 2023
owen-d
approved these changes
Nov 15, 2023
jeschkies
pushed a commit
that referenced
this pull request
Nov 21, 2023
**What this PR does / why we need it**: We want to control bloom compaction per tenant basis. Adding configs to enable/disable bloom compactor. **Which issue(s) this PR fixes**: Fixes #<issue number> **Special notes for your reviewer**: **Checklist** - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [x] Documentation added - [ ] Tests updated - [ ] `CHANGELOG.md` updated - [ ] If the change is worth mentioning in the release notes, add `add-to-release-notes` label - [ ] Changes that require user attention or interaction to upgrade are documented in `docs/sources/setup/upgrade/_index.md` - [ ] For Helm chart changes bump the Helm chart version in `production/helm/loki/Chart.yaml` and update `production/helm/loki/CHANGELOG.md` and `production/helm/loki/README.md`. [Example PR](d10549e) - [ ] If the change is deprecating or removing a configuration option, update the `deprecated-config.yaml` and `deleted-config.yaml` files respectively in the `tools/deprecated-config-checker` directory. [Example PR](0d4416a)
rhnasc
pushed a commit
to inloco/loki
that referenced
this pull request
Apr 12, 2024
…#11235) **What this PR does / why we need it**: We want to control bloom compaction per tenant basis. Adding configs to enable/disable bloom compactor. **Which issue(s) this PR fixes**: Fixes #<issue number> **Special notes for your reviewer**: **Checklist** - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [x] Documentation added - [ ] Tests updated - [ ] `CHANGELOG.md` updated - [ ] If the change is worth mentioning in the release notes, add `add-to-release-notes` label - [ ] Changes that require user attention or interaction to upgrade are documented in `docs/sources/setup/upgrade/_index.md` - [ ] For Helm chart changes bump the Helm chart version in `production/helm/loki/Chart.yaml` and update `production/helm/loki/CHANGELOG.md` and `production/helm/loki/README.md`. [Example PR](grafana@d10549e) - [ ] If the change is deprecating or removing a configuration option, update the `deprecated-config.yaml` and `deleted-config.yaml` files respectively in the `tools/deprecated-config-checker` directory. [Example PR](grafana@0d4416a)
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.
What this PR does / why we need it:
We want to control bloom compaction per tenant basis. Adding configs to enable/disable bloom compactor.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Checklist
CONTRIBUTING.mdguide (required)CHANGELOG.mdupdatedadd-to-release-noteslabeldocs/sources/setup/upgrade/_index.mdproduction/helm/loki/Chart.yamland updateproduction/helm/loki/CHANGELOG.mdandproduction/helm/loki/README.md. Example PRdeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR