fix(blooms): Fix partitionSeriesByDay function
#12900
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 <[email protected]>
Signed-off-by: Christian Haudum <[email protected]>
chaudum
changed the title
partitionByDay functionpartitionSeriesByDay function
|
This PR must be merged before a backport PR will be created. |
1 similar comment
|
This PR must be merged before a backport PR will be created. |
salvacorts
approved these changes
May 6, 2024
| 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()) |
| @@ -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 { | |||
There was a problem hiding this comment.
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.
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 <[email protected]> (cherry picked from commit 738c274)
7 tasks
chaudum
added a commit
that referenced
this pull request
May 6, 2024
Backport 738c274 from #12900 Co-authored-by: Christian Haudum <[email protected]>
This was referenced May 13, 2024
This was referenced May 27, 2024
This was referenced Jun 10, 2024
This was referenced Jul 3, 2024
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
The function
partitionSeriesByDaycould 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
partitionSeriesByDayfor would remove that day resulting in no task.Checklist
CONTRIBUTING.mdguide (required)featPRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.docs/sources/setup/upgrade/_index.mdproduction/helm/loki/Chart.yamland updateproduction/helm/loki/CHANGELOG.mdandproduction/helm/loki/README.md. Example PRdeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR