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

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

Merged
merged 14 commits into from Jul 15, 2019

Conversation

@tiancaiamao
Copy link
Contributor

tiancaiamao commented Jul 2, 2019

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

This comment has been minimized.

Copy link
Contributor Author

tiancaiamao commented Jul 2, 2019

Copy link
Member

crazycs520 left a comment

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

This comment has been minimized.

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

This comment has been minimized.

Copy link
Contributor Author

tiancaiamao commented Jul 3, 2019

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

This comment has been minimized.

Copy link
Contributor Author

tiancaiamao commented Jul 3, 2019

I agree that

It's better to cherry pick PRs one by one

But it's stubborn to always follow this rule.

tiancaiamao added 2 commits Jul 3, 2019
@tiancaiamao

This comment has been minimized.

Copy link
Contributor Author

tiancaiamao commented Jul 3, 2019

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

@tiancaiamao

This comment has been minimized.

Copy link
Contributor Author

tiancaiamao commented Jul 3, 2019

/run-all-tests

@tiancaiamao

This comment has been minimized.

Copy link
Contributor Author

tiancaiamao commented Jul 3, 2019

Waiting for #11048

jackysp and others added 3 commits Jul 3, 2019
@tiancaiamao

This comment has been minimized.

Copy link
Contributor Author

tiancaiamao commented Jul 8, 2019

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

@zz-jason

This comment has been minimized.

Copy link
Member

zz-jason commented Jul 8, 2019

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

Copy link
Member

zz-jason left a comment

LGTM

@zz-jason zz-jason added status/LGT2 and removed status/LGT1 labels Jul 8, 2019
@tiancaiamao

This comment has been minimized.

Copy link
Contributor Author

tiancaiamao commented Jul 8, 2019

/run-common-test

@zz-jason

This comment has been minimized.

Copy link
Member

zz-jason commented Jul 11, 2019

@tiancaiamao Please fix the conflicts

@tiancaiamao

This comment has been minimized.

Copy link
Contributor Author

tiancaiamao commented Jul 12, 2019

Conflicts are fixed @zz-jason

tiancaiamao added 2 commits Jul 15, 2019
@tiancaiamao

This comment has been minimized.

Copy link
Contributor Author

tiancaiamao commented Jul 15, 2019

/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
6 checks passed
6 checks passed
ci/circleci Your tests passed on CircleCI!
Details
idc-jenkins-ci-tidb/build Jenkins job succeeded.
Details
idc-jenkins-ci-tidb/build_check_race Jenkins job succeeded.
Details
idc-jenkins-ci-tidb/check_dev Jenkins job succeeded.
Details
idc-jenkins-ci-tidb/check_dev_2 Jenkins job succeeded.
Details
license/cla Contributor License Agreement is signed.
Details
@tiancaiamao tiancaiamao deleted the tiancaiamao:max-execution-time branch Jul 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.