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

expensivequery: fix the issue that max_exec_time hint doesn't work if it exceeds the expensive-threshold (#17359) #17534

Merged
merged 4 commits into from
Jun 1, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented May 29, 2020

cherry-pick #17359 to release-3.0


What problem does this PR solve?

Issue Number: close #17355, #17393

Problem Summary:

1. Minimal reproduce step (Required)

set @@max_execution_time=60000;
select sleep(70);

2. What did you expect to see? (Required)

mysql> select sleep(70);
+-----------+
| sleep(70) |
+-----------+
| 1 |
+-----------+
1 row in set (1 min )

3. What did you see instead (Required)

mysql> select sleep(70);
+-----------+
| sleep(70) |
+-----------+
|         0 |
+-----------+
1 row in set (1 min 10.00 sec)

What is changed and how it works?

What's Changed:
repair max_execution_time sometimes fails.
How it Works:
The MaxExecutionTime and ExceedExpensiveTimeThresh check logic separately.

Related changes

  • Need to cherry-pick to the release branch
    cherry-pick: V3.0,V3.1,V4.0

Check List

Tests

  • Unit test

Release note

  • Fix the issue that the max_execution_time sometimes fails.

Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor Author

sre-bot commented May 29, 2020

/run-all-tests

@qw4990 qw4990 added the priority/release-blocker This issue blocks a release. Please solve it ASAP. label Jun 1, 2020
Copy link
Contributor

@qw4990 qw4990 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@XuHuaiyu XuHuaiyu left a comment

Choose a reason for hiding this comment

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

LGTM

@tiancaiamao
Copy link
Contributor

/run-all-tests

@bb7133
Copy link
Member

bb7133 commented Jun 1, 2020

/merge

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

sre-bot commented Jun 1, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 1, 2020

@sre-bot merge failed.

@bb7133
Copy link
Member

bb7133 commented Jun 1, 2020

/run-mybatis-test

@bb7133 bb7133 merged commit 9f55cf9 into pingcap:release-3.0 Jun 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution This PR is from a community contributor. priority/release-blocker This issue blocks a release. Please solve it ASAP. sig/execution SIG execution status/can-merge Indicates a PR has been approved by a committer. type/bugfix This PR fixes a bug. type/3.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants