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: Do not filter out chunks for store when From==Through and From==start #13117

Merged
merged 4 commits into from
Jun 4, 2024

Conversation

chaudum
Copy link
Contributor

@chaudum chaudum commented Jun 4, 2024

What this PR does / why we need it:

This PR fixes a bug where chunks are incorrectly filtered out when their From timestamp is equal to their Through timestamp (which happens when there is a single log line) and the From timestamp is equal to the from time of the of the request.

How to reproduce:

  1. Insert a single log line with a timestamp exactly at point of an hour
  2. Flush ingester
  3. Query log line with a split interval of 1h

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

  • In a query range, the From is inclusive and the Through is exclusive
  • In a ChunkRef, both From and Through are inclusive, because Through represents the timestamp of the last log line in the chunk.

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

chaudum added 2 commits June 4, 2024 13:43
Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
@chaudum chaudum changed the title fix: Do not filter out chunks for store when From ==Through and From == start fix: Do not filter out chunks for store when From==Through and From==start Jun 4, 2024
Co-authored-by: Ed Welch <edward.welch@grafana.com>
@chaudum chaudum marked this pull request as ready for review June 4, 2024 13:27
@chaudum chaudum requested a review from a team as a code owner June 4, 2024 13:27
@chaudum chaudum added the type/bug Somehing is not working as expected label Jun 4, 2024
Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
@grafanabot
Copy link
Collaborator

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

Copy link
Collaborator

@slim-bean slim-bean left a comment

Choose a reason for hiding this comment

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

LGTM, nice find!

@chaudum chaudum merged commit d9cc513 into main Jun 4, 2024
60 checks passed
@chaudum chaudum deleted the chaudum/fix-store-range-chunk-filtering branch June 4, 2024 16:38
grafanabot pushed a commit that referenced this pull request Jun 4, 2024
…m==start` (#13117)

This PR fixes a bug where chunks are incorrectly filtered out when their `From` timestamp is equal to their `Through` timestamp (which happens when there is a single log line) and the `From` timestamp is equal to the `from` time of the of the request.

How to reproduce:

1. Insert a single log line with a timestamp exactly at point of an hour
2. Flush ingester
3. Query log line with a split interval of 1h

Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
Co-authored-by: Ed Welch <edward.welch@grafana.com>
(cherry picked from commit d9cc513)
chaudum added a commit that referenced this pull request Jun 4, 2024
…ough` and `From==start` (#13121)

Backport d9cc513 from #13117

This PR fixes a bug where chunks are incorrectly filtered out when their From timestamp is equal to their Through timestamp (which happens when there is a single log line) and the From timestamp is equal to the from time of the of the request.

How to reproduce:

* Insert a single log line with a timestamp exactly at point of an hour
* Flush ingester
* Query log line with a split interval of 1h

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 k205 size/S type/bug Somehing is not working as expected
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants