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: Adjust tailer loop criteria so it is actually re-tested #13906

Merged
merged 1 commit into from
Aug 16, 2024

Conversation

paul1r
Copy link
Collaborator

@paul1r paul1r commented Aug 16, 2024

What this PR does / why we need it:
A previous commit was made to adjust for a data race. This commit was incorrect in the sense that the criteria for exiting the loop was only set before starting the loop, and never actually retested.

This particular commit addresses that issue.

Which issue(s) this PR fixes:
Fixes #

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

@paul1r paul1r requested a review from a team as a code owner August 16, 2024 11:53
@paul1r
Copy link
Collaborator Author

paul1r commented Aug 16, 2024

go test -race -count=1 ./pkg/querier
ok  	github.com/grafana/loki/v3/pkg/querier	2.497s

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

@paul1r paul1r merged commit dabbfd8 into main Aug 16, 2024
63 checks passed
@paul1r paul1r deleted the paul1r/tailer_loop_adjustment branch August 16, 2024 12:01
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