Skip to content

Conversation

@grobinson-grafana
Copy link
Contributor

@grobinson-grafana grobinson-grafana commented Oct 15, 2025

What this PR does / why we need it:

This commit fixes a race condition in the push tracker where both the p.done and p.err channels could have a value at the same time. This could cause the distributor to return success when it should instead have returned an error.

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
  • 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

@grobinson-grafana grobinson-grafana force-pushed the grobinson/fix-race-condition-in-tracker branch 8 times, most recently from 5b34fb2 to b3d4ad5 Compare October 16, 2025 12:00
@grobinson-grafana grobinson-grafana marked this pull request as ready for review October 16, 2025 12:57
@grobinson-grafana grobinson-grafana requested a review from a team as a code owner October 16, 2025 12:57
@grobinson-grafana grobinson-grafana force-pushed the grobinson/fix-race-condition-in-tracker branch from b3d4ad5 to 2301021 Compare October 16, 2025 13:48
This commit fixes a race condition in the push tracker where
both the p.done and p.err channels could have a value at the
same time. This could cause the distributor to return success
when it should instead have returned an error.
@grobinson-grafana grobinson-grafana force-pushed the grobinson/fix-race-condition-in-tracker branch from 2301021 to 5dc2cd5 Compare October 16, 2025 13:50
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