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(blooms): Fix a regression introduced with #12774 #12776

Merged
merged 2 commits into from
Apr 24, 2024
Merged

Conversation

chaudum
Copy link
Contributor

@chaudum chaudum commented Apr 24, 2024

What this PR does / why we need it:

This PR fixes a regression introduced with #12774 where series where wrongly identified as "skipped" even though there were part of blocks.

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
  • 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

Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
Comment on lines 127 to 148
var seriesInBlocks int
var chunksInBlocks int
for _, b := range blocks {
seriesInBlocks += len(b.series)
for _, s := range b.series {
chunksInBlocks += len(s.Refs)
}
}
var chunksSkipped int
for _, s := range skipped {
chunksSkipped += len(s.Refs)
}
level.Debug(bq.logger).Log(
"msg", "debug skipped series",
"day", s.day.String(),
"series_total", len(s.series),
"series_in_blocks", seriesInBlocks,
"series_skipped", len(skipped),
"chunks_total", chunks,
"chunks_in_blocks", chunksInBlocks,
"chunks_skipped", chunksSkipped,
)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Remove excessive logging

@chaudum chaudum marked this pull request as ready for review April 24, 2024 14:50
@chaudum chaudum requested a review from a team as a code owner April 24, 2024 14:50
@grafanabot
Copy link
Collaborator

This PR must be merged before a backport PR will be created.

1 similar comment
@grafanabot
Copy link
Collaborator

This PR must be merged before a backport PR will be created.

Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
@chaudum chaudum force-pushed the chaudum/fix-12774 branch from b6447eb to a544450 Compare April 24, 2024 14:57
@chaudum chaudum enabled auto-merge (squash) April 24, 2024 14:59
@chaudum chaudum merged commit ecefb49 into main Apr 24, 2024
58 checks passed
@chaudum chaudum deleted the chaudum/fix-12774 branch April 24, 2024 15:04
grafanabot pushed a commit that referenced this pull request Apr 24, 2024
This PR fixes a regression introduced with #12774 where series where wrongly identified as "skipped" even though there were part of blocks.

Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
(cherry picked from commit ecefb49)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants