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

Handle context cancellation in some of the querier downstream requests #5080

Merged
merged 24 commits into from
Jan 10, 2022

Conversation

kavirajk
Copy link
Contributor

@kavirajk kavirajk commented Jan 8, 2022

What this PR does / why we need it:
This PR handles context cancellation in some of the querier downstream requests.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Documentation added
  • Tests updated
  • Add an entry in the CHANGELOG.md about the changes.

cyriltovena and others added 16 commits January 6, 2022 14:52
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
@kavirajk kavirajk changed the title Handles context cancellation correctly in some of the querier upstream calls. [WIP]: Handles context cancellation correctly in some of the querier upstream calls. Jan 8, 2022
@cyriltovena
Copy link
Contributor

This include change we already merge or are in-review process. Can we just keep context check one we added ?

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
@pull-request-size pull-request-size bot added size/S and removed size/M labels Jan 10, 2022
@kavirajk kavirajk changed the title [WIP]: Handles context cancellation correctly in some of the querier upstream calls. Handle context cancellation in some of the querier downstream requests Jan 10, 2022
@kavirajk kavirajk marked this pull request as ready for review January 10, 2022 15:06
@kavirajk kavirajk requested a review from a team as a code owner January 10, 2022 15:06
@kavirajk
Copy link
Contributor Author

@cyriltovena Yes. done :)

pkg/querier/http.go Outdated Show resolved Hide resolved
Copy link
Contributor

@cyriltovena cyriltovena left a comment

Choose a reason for hiding this comment

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

LGTM

Co-authored-by: Cyril Tovena <cyril.tovena@gmail.com>
@cyriltovena
Copy link
Contributor

You have a build error, my bad my suggestion didn't remove the import.

@@ -6,6 +6,7 @@ import (
"time"

util_log "github.com/cortexproject/cortex/pkg/util/log"
"github.com/cortexproject/cortex/pkg/util/spanlogger"
Copy link
Contributor

Choose a reason for hiding this comment

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

this one.

@owen-d owen-d merged commit c5aa9f1 into main Jan 10, 2022
@owen-d owen-d deleted the cancelation-issue-with-querier branch January 10, 2022 19:55
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.

3 participants