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: Defer closing blocks iter after checking error from loadWorkForGap #12934

Merged
merged 1 commit into from
May 10, 2024

Conversation

salvacorts
Copy link
Contributor

What this PR does / why we need it:

Compactors may panic if SimpleBloomController.loadWorkForGap returns an error due to setting the defer function that closes the block iterators (blocksIter) which is nil before checking and returning on error.

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

@salvacorts salvacorts marked this pull request as ready for review May 10, 2024 10:34
@salvacorts salvacorts requested a review from a team as a code owner May 10, 2024 10:34
Copy link
Contributor

@ashwanthgoli ashwanthgoli left a comment

Choose a reason for hiding this comment

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

lgtm

@salvacorts salvacorts merged commit cb1f5d9 into main May 10, 2024
59 checks passed
@salvacorts salvacorts deleted the salvacorts/fix-panic-compactor-err-loadWork branch May 10, 2024 13:27
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