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

Fixes a swallowed context err in the batch storage. #3025

Merged

Conversation

cyriltovena
Copy link
Contributor

Fixes #2999

There's still a potential cases where, the context is done (and so the Err is not nil) and we're finished (line 141)
with iterating over the list of batches. I didn't introduce the error here because I think I would prefer a success in this case.

Signed-off-by: Cyril Tovena [email protected]

Fixes grafana#2999

There's still a potential cases where, the context is done (and so the Err is not nil) and we're finished
with iterating over the list of batches. I didn't introduce the error here because I think I would prefer a success in this case.

Signed-off-by: Cyril Tovena <[email protected]>
Copy link
Contributor

@kavirajk kavirajk left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Member

@owen-d owen-d left a comment

Choose a reason for hiding this comment

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

LGTM.

@owen-d owen-d merged commit c98dfa0 into grafana:master Dec 3, 2020
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.

when query-timeout is reached, queries silently fail and return partial results
3 participants