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

fix(distributor): validate partition ring is kafka is enabled #14303

Merged

Conversation

cyriltovena
Copy link
Contributor

What this PR does / why we need it:

I think it makes more sense to also enable partition ring when distributor push kafka is enabled

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • 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
  • 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

@cyriltovena cyriltovena requested a review from a team as a code owner September 28, 2024 12:14
Copy link
Contributor

@benclive benclive left a comment

Choose a reason for hiding this comment

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

Approving but see the comment.

@@ -1753,7 +1753,7 @@ func (t *Loki) initAnalytics() (services.Service, error) {

// The Ingest Partition Ring is responsible for watching the available ingesters and assigning partitions to incoming requests.
func (t *Loki) initPartitionRing() (services.Service, error) {
if !t.Cfg.Ingester.KafkaIngestion.Enabled {
if !t.Cfg.Ingester.KafkaIngestion.Enabled && !t.Cfg.Distributor.KafkaEnabled {
Copy link
Contributor

Choose a reason for hiding this comment

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

This makes sense but the distributor won't be able to send any data to Kafka unless the ingester is also enabled due to needing some active partitions. I wonder if we should just use a single flag to enable the kafka write path?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I understand although it feels weird that having t.Cfg.Distributor.KafkaEnabled without t.Cfg.Ingester.KafkaIngestion.Enabled panics ? Should we validate instead ?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yep, I think we need to validate that ingestion is enabled if distributor is enabled, since they're coupled in the architecture.

Copy link
Contributor

Choose a reason for hiding this comment

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

To clarify, I think we want to keep both flags because we want the option to stop writing to Kafka without changing the ingesters.
But we also want a validation for All (and maybe Write) mode to enforce that the ingester is enabled if the distributor is enabled. We don't want this check for micro-services mode though, since those flags can be set explicitly on those components.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok I'll add a validation. That will avoid the panic at least.

@cyriltovena cyriltovena changed the title fix(distributor): Activate partition ring is kafka is enabled fix(distributor): validate partition ring is kafka is enabled Oct 4, 2024
@cyriltovena cyriltovena merged commit 8438d41 into grafana:main Oct 4, 2024
60 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants