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.

Sign up for GitHub

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

Jump to bottom

store: proxy: fix queries never timing out bug #2411

Merged
merged 2 commits into from Apr 14, 2020
Merged

store: proxy: fix queries never timing out bug #2411

merged 2 commits into from Apr 14, 2020

Commits on Apr 10, 2020

  1. store: proxy: add test for deadlocking problem 

    Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
    @GiedriusS
    GiedriusS committed Apr 10, 2020
    Copy the full SHA
    fb39b30 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2020

  1. store: proxy: add fix for timeouts 

    Checking here if the series context has ended is the correct fix here.
We want to check it because if any of the other Series() calls error out
then the context is canceled. So, it is equal to checking for errors
"downstream", in `mergedSeriesSet`.

Also, `handleErr()` here is the correct function to use because in such
a case we want to set `s.err` -- if `io.EOF` still hasn't been received
then it means that StoreAPI still has some data that it wants to send
but hasn't yet.

With this, the previously added test passes.

Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
    @GiedriusS
    GiedriusS committed Apr 12, 2020
    Copy the full SHA
    20bd2aa View commit details
    Browse the repository at this point in the history