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 partitionSeriesByDay function #12900

Merged
merged 2 commits into from
May 6, 2024

Conversation

chaudum
Copy link
Contributor

@chaudum chaudum commented May 6, 2024

What this PR does / why we need it:

The function partitionSeriesByDay could yield empty when chunks were outside of the requested time range.

This would result in requests for a time range that does not contain any
chunks for a series to filter. These requests would return errors, because a subsequent partitionSeriesByDay for would remove that day resulting in no task.

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 function `partitionSeriesByDay` could yield empty
when chunks were outside of the requested time range.

This would result in requests for a time range that does not contain any
series and chunks to filter. These requests would return errors.

Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
@chaudum chaudum requested a review from a team as a code owner May 6, 2024 13:34
@chaudum chaudum added type/bug Somehing is not working as expected backport k201 labels May 6, 2024
@chaudum chaudum changed the title fix(blooms): Fix partitionByDay function May 6, 2024
@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.

Copy link
Contributor

@salvacorts salvacorts left a comment

Choose a reason for hiding this comment

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

Excellent catch 👏 LGTM

func truncateDay(ts model.Time) model.Time {
// model.minimumTick is time.Millisecond
return ts - (ts % model.Time(24*time.Hour/time.Millisecond))
return model.TimeFromUnix(ts.Time().Truncate(Day).Unix())
Copy link
Contributor

Choose a reason for hiding this comment

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

❤️

@@ -125,7 +119,7 @@ func partitionSeriesByDay(from, through model.Time, seriesWithChunks []*logproto
})

// All chunks fall outside of the range
if min == len(chunks) || max == 0 {
if min == len(chunks) || max == 0 || min == max {
Copy link
Contributor

Choose a reason for hiding this comment

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

idea: I feel we have run already too many times into forgetting to check min==max maybe we should wrap this search use-case into some Template function or something.

@chaudum chaudum merged commit 738c274 into main May 6, 2024
61 checks passed
@chaudum chaudum deleted the chaudum/fix-partition-by-day branch May 6, 2024 14:26
grafanabot pushed a commit that referenced this pull request May 6, 2024
The function `partitionSeriesByDay` could yield empty when chunks were outside of the requested time range.

This would result in requests for a time range that does not contain any
chunks for a series to filter. These requests would return errors, because a subsequent `partitionSeriesByDay` for would remove that day resulting in no task.

Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
(cherry picked from commit 738c274)
chaudum added a commit that referenced this pull request May 6, 2024
Backport 738c274 from #12900


Co-authored-by: Christian Haudum <christian.haudum@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport k201 size/M type/bug Somehing is not working as expected
3 participants