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

tikv: make requests fail quickly when the dial times out. (#12819) (#12926) #13286

Merged
merged 3 commits into from Nov 8, 2019

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Nov 8, 2019

cherry-pick #12926 to release-3.1


cherry-pick #12819 to 3.0

# Conflicts:
#	store/tikv/client_batch.go

conflict caused by logutil.Bg() => logutil.Context(context.Backgrou())


This change is Reviewable

@sre-bot
Copy link
Contributor Author

sre-bot commented Nov 8, 2019

/run-all-tests

@lysu
Copy link
Collaborator

lysu commented Nov 8, 2019

/run-all-tests

@lysu lysu requested review from coocood and removed request for ngaut November 8, 2019 08:17
Copy link
Member

@jackysp jackysp left a comment

Choose a reason for hiding this comment

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

LGTM

@jackysp jackysp added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 8, 2019
Copy link
Member

@coocood coocood left a comment

Choose a reason for hiding this comment

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

LGTM

@jackysp jackysp added the status/can-merge Indicates a PR has been approved by a committer. label Nov 8, 2019
@sre-bot
Copy link
Contributor Author

sre-bot commented Nov 8, 2019

Your auto merge job has been accepted, waiting for 13252, 13292

@sre-bot
Copy link
Contributor Author

sre-bot commented Nov 8, 2019

/run-all-tests

@sre-bot sre-bot merged commit 791a75a into pingcap:release-3.1 Nov 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/tikv status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants