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

*: make Backoff perceive the Killed flag to fix MAX_EXECUTION_TIME #14552 #14614

Merged
merged 2 commits into from
Feb 4, 2020

Conversation

tiancaiamao
Copy link
Contributor

Cherry-pick #14552

Release note

  • Fix a bug MAX_EXECUTION_TIME doesn't take effect in some cases

@tiancaiamao
Copy link
Contributor Author

PTAL @jackysp @imtbkcat

Copy link
Contributor

@crazycs520 crazycs520 left a comment

Choose a reason for hiding this comment

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

LGTM

@crazycs520 crazycs520 added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 4, 2020
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
Copy link
Member

jackysp commented Feb 4, 2020

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 4, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Feb 4, 2020

Your auto merge job has been accepted, waiting for 14610

@sre-bot
Copy link
Contributor

sre-bot commented Feb 4, 2020

/run-all-tests

@sre-bot sre-bot merged commit 80d515c into pingcap:release-3.0 Feb 4, 2020
@tiancaiamao tiancaiamao deleted the cherry-backoff-kill branch March 19, 2020 02:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/server status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants