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 issue where concatenatingChunkIterator can obscure errors #13084

Merged
merged 1 commit into from
Nov 22, 2023

Conversation

charleskorn
Copy link
Contributor

@charleskorn charleskorn commented Nov 2, 2023

This PR fixes a similar issue to #13006, but this time for concatenatingChunkIterator.

If a consumer of a concatenatingChunkIterator does not consume it all the way to the end (ie. until Next() returns false), it may not know to check for an error.

With this PR, concatenatingChunkIterator.Next() will instead begin returning false as soon as the current iterator reports an error.

This PR upstreams the change from grafana/mimir-prometheus#549, which has already been tested in Mimir.

Signed-off-by: Charles Korn <charles.korn@grafana.com>
@charleskorn charleskorn marked this pull request as draft November 7, 2023 23:48
@charleskorn
Copy link
Contributor Author

Converting this back to draft while we investigate a possible issue with this change.

@charleskorn
Copy link
Contributor Author

This PR is good to go again, the issue was unrelated to this change.

@charleskorn charleskorn marked this pull request as ready for review November 9, 2023 05:30
Copy link
Member

@bboreham bboreham left a comment

Choose a reason for hiding this comment

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

Seems reasonable.

@charleskorn
Copy link
Contributor Author

Any chance you could merge this @bboreham?

@bboreham bboreham merged commit a2d5c02 into prometheus:main Nov 22, 2023
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants