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: Fix nil pointer dereference in bloomstore initialisation #12869

Merged
merged 1 commit into from
May 6, 2024

Conversation

chaudum
Copy link
Contributor

@chaudum chaudum commented May 3, 2024

What this PR does / why we need it:

The bloom store initialisation updates the shipper configuration which in turn requires the index gateway ring to be initialised in case -index-gateway.mode is set to ring.

Therefore the BloomStore module needs to depend on the IndexGatewayRing module.

Which issue(s) this PR fixes:

Fixes #12270

Special notes for the reviewer:

This fix is done against the release-3.0.x branch only, because on main (and therefore future versions), the dependencies and module initialisation changed already, and the bug does not manifest.

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

The bloom store initialisation updates the shipper configuration
which in turn requires the index gateway ring to be initialized in case
`-index-gateway.mode` is set to `ring`.

Therefore the `BloomStore` module needs to depend on the
`IndexGatewayRing` module.

Fixes #12270

Signed-off-by: Christian Haudum <[email protected]>
@chaudum chaudum requested a review from a team as a code owner May 3, 2024 07:57
Copy link
Contributor

@MichelHollands MichelHollands left a comment

Choose a reason for hiding this comment

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

LGTM

@chaudum chaudum merged commit 167b468 into release-3.0.x May 6, 2024
53 checks passed
@chaudum chaudum deleted the chaudum/fix-nil-pointer-dereference branch May 6, 2024 15:04
@der-eismann
Copy link
Contributor

Is this going to be released anytime soon? It's been 2 months since the 3.0.0 release and we really want to upgrade to make use of the OTLP integration.

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.

3 participants