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

*: Add support for MAX_EXECUTION_TIME (#10541) (#10963) #11026

Merged
merged 14 commits into from
Jul 15, 2019
Merged

*: Add support for MAX_EXECUTION_TIME (#10541) (#10963) #11026

merged 14 commits into from
Jul 15, 2019

Conversation

tiancaiamao
Copy link
Contributor

Cherry-pick #10541 and #10963

10541 adds support for MAX_EXECUTION_TIME, and 10963 is a tiny fix (2 line changes) for 10541, so I merge them into this one.

@tiancaiamao
Copy link
Contributor Author

PTAL @crazycs520 @qw4990

crazycs520
crazycs520 reviewed Jul 3, 2019
View reviewed changes
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 changed the title *: Add support for MAX_EXECUTION_TIME (#10541) *: Add support for MAX_EXECUTION_TIME (#10541) (#10963) Jul 3, 2019
@zz-jason
Copy link
Member

zz-jason commented Jul 3, 2019

It's better to cherry pick PRs one by one, no matter how small a PR is.

@tiancaiamao
Copy link
Contributor Author

MAX_EXECUTION_TIME is a newly introduced feature. If we don't cherry pick the first PR, there is no need to cherry-pick the bug fix, so it's better for them to be together.
One additional advantage is that it cost less energy to address conflicts during the cherry-pick.
If we split it into two PRs, we have to cherry-pick twice, address conflicts twice, and the second one has to wait for the first one to be merged.... even it's only two lines change. @zz-jason

@tiancaiamao
Copy link
Contributor Author

I agree that

It's better to cherry pick PRs one by one

But it's stubborn to always follow this rule.

@tiancaiamao tiancaiamao added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 3, 2019
@tiancaiamao
Copy link
Contributor Author

/run-all-tests tidb-test=release-3.0 tikv=release-3.0 pd=release-3.0

@tiancaiamao
Copy link
Contributor Author

/run-all-tests

@tiancaiamao
Copy link
Contributor Author

Waiting for #11048

@tiancaiamao
Copy link
Contributor Author

/run-all-tests tidb-test=release-3.0 tikv=release-3.0 pd=release-3.0

@zz-jason
Copy link
Member

zz-jason commented Jul 8, 2019

/run-integration-common-test
/run-common-test
/run-unit-test

zz-jason
zz-jason previously approved these changes Jul 8, 2019
View reviewed changes
Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

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

LGTM

@zz-jason zz-jason added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 8, 2019
@tiancaiamao
Copy link
Contributor Author

/run-common-test

@zz-jason
Copy link
Member

@tiancaiamao Please fix the conflicts

@tiancaiamao tiancaiamao added the priority/release-blocker This issue blocks a release. Please solve it ASAP. label Jul 12, 2019
@tiancaiamao
Copy link
Contributor Author

Conflicts are fixed @zz-jason

@tiancaiamao
Copy link
Contributor Author

/run-all-tests tidb-test=release-3.0 tikv=release-3.0 pd=release-3.0

@winkyao winkyao merged commit 3ad5ff6 into pingcap:release-3.0 Jul 15, 2019
@tiancaiamao tiancaiamao deleted the max-execution-time branch July 15, 2019 09:09
This was referenced Jul 17, 2019
Merged
Merged
@bb7133 bb7133 mentioned this pull request Jul 18, 2019
Merged
@sylzd sylzd mentioned this pull request Dec 9, 2021
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@crazycs520 crazycs520 crazycs520 left review comments

@winkyao winkyao winkyao approved these changes

@zz-jason zz-jason zz-jason left review comments

Assignees
No one assigned
Labels
priority/release-blocker This issue blocks a release. Please solve it ASAP. status/LGT2 Indicates that a PR has LGTM 2. type/new-feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@tiancaiamao @zz-jason @winkyao @crazycs520 @jackysp