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

UCP: add timeout config for query metrics from Prometheus (#2093) #2107

Merged

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Apr 2, 2020

cherry-pick #2093 to release-1.1


Signed-off-by: Qiannan Lyu [email protected]

UCP: #1753

What problem does this PR solve?

fixes: #1753

What is changed and how does it work?

Added timeout context for http request and set the timeout time 5s.

Check List

Tests

Code changes

  • Has Go code change

Does this PR introduce a user-facing change?:

NONE

Copy link
Contributor

@DanielZhangQD DanielZhangQD left a comment

Choose a reason for hiding this comment

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

LGTM

@DanielZhangQD
Copy link
Contributor

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 2, 2020

Your auto merge job has been accepted, waiting for 2101, 2100, 2102

@DanielZhangQD DanielZhangQD merged commit 02a0ee1 into pingcap:release-1.1 Apr 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants