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) #17536

Merged
merged 6 commits into from
Jun 17, 2020

Conversation

sre-bot
Copy link
Contributor

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

cherry-pick #17359 to release-4.0


What problem does this PR solve?

Issue Number: close #17355, close #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 sre-bot requested a review from a team as a code owner May 29, 2020 11:10
@sre-bot
Copy link
Contributor Author

sre-bot commented May 29, 2020

/run-all-tests

@sre-bot sre-bot added sig/execution SIG execution contribution This PR is from a community contributor. type/4.0-cherry-pick type/bugfix This PR fixes a bug. labels May 29, 2020
@ghost ghost requested a review from SunRunAway May 29, 2020 11:11
@sre-bot sre-bot requested review from qw4990 and XuHuaiyu May 29, 2020 11:11
@ghost ghost removed request for a team, qw4990 and XuHuaiyu May 29, 2020 11:11
@sre-bot sre-bot added this to the v4.0.1 milestone May 29, 2020
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.

@XuHuaiyu Please resolve the conflicts.

@XuHuaiyu XuHuaiyu requested review from zz-jason and qw4990 and removed request for SunRunAway June 3, 2020 02:40
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
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/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. labels Jun 3, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 3, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 3, 2020

@sre-bot merge failed.

@zz-jason
Copy link
Member

zz-jason commented Jun 3, 2020

/merge

@zz-jason
Copy link
Member

zz-jason commented Jun 3, 2020

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 3, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 3, 2020

@sre-bot merge failed.

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 3, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 3, 2020

@sre-bot merge failed.

@bb7133 bb7133 modified the milestones: v4.0.1, v4.0.2 Jun 6, 2020
@zz-jason
Copy link
Member

zz-jason commented Jun 6, 2020

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 6, 2020

Your auto merge job has been accepted, waiting for:

  • 17694
  • 17680
  • 17681
  • 17648
  • 17705
  • 17719
  • 17651
  • 17636

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 6, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 6, 2020

@sre-bot merge failed.

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 13, 2020

@sre-bot, please update your pull request.

@XuHuaiyu
Copy link
Contributor

/merge

@ti-srebot
Copy link
Contributor

Sorry @XuHuaiyu, you don't have permission to trigger auto merge event on this branch.

@jackysp
Copy link
Member

jackysp commented Jun 17, 2020

/merge

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit e2bc62f into pingcap:release-4.0 Jun 17, 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. sig/execution SIG execution status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/4.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants