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

Configure split-and-merge compactor in jsonnet #853

Merged
merged 2 commits into from
Jan 24, 2022

Conversation

pracucci
Copy link
Collaborator

What this PR does:
Now that split-and-merge compactor is the only strategy support, I propose to upstream our config to the OSS mixin.

Which issue(s) this PR fixes:
N/A

Checklist

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

Copy link
Member

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -19,6 +19,18 @@
'compactor.compaction-concurrency': $._config.cortex_compactor_max_concurrency,
'compactor.cleanup-interval': $._config.cortex_compactor_cleanup_interval,

// Will be set on per-tenant basis via overrides and user classes. No splitting by default.
'compactor.split-and-merge-shards': 0,
'compactor.compactor-tenant-shard-size': 1,
Copy link
Member

Choose a reason for hiding this comment

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

Our new default in #852 is 0. Shall we use the same value?

Copy link
Collaborator Author

@pracucci pracucci Jan 24, 2022

Choose a reason for hiding this comment

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

My take on this: config defaults should target generic users not necessarily using our jsonnet. Our jsonnet reflects our setup (eg. we have user classes and override it on large tenants) and it may differ from general purpose defaults.

Copy link
Member

Choose a reason for hiding this comment

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

My question was whether we would like to use 0 here, so that tenant's jobs would be sharded across all compactors by default (even in our setup).

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Right. We can discuss it separately. In this PR I just wanted to upstream the current state.

@pracucci pracucci force-pushed the configure-split-and-merge-compactor-in-jsonnet branch from 801423e to 7417f7f Compare January 24, 2022 13:54
@pracucci pracucci merged commit 66866c2 into main Jan 24, 2022
@pracucci pracucci deleted the configure-split-and-merge-compactor-in-jsonnet branch January 24, 2022 14:07
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.

2 participants