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

fix bug in MinTSOScheduler that estimated_thread_usage/waiting_tasks_count/active_tasks_count are not 0 even if there is no queries running (#5557) #5561

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #5557

Signed-off-by: xufei [email protected]

What problem does this PR solve?

Issue Number: close #5556

Problem Summary:

What is changed and how it works?

Fix some bugs that active tasks count/ estimated thread usage may be repeat added, and type_waiting_tasks_count may lost update when schedule meet error.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

None

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Aug 8, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bestwoody
  • yibin87

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/cherry-pick-not-approved size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/cherry-pick-for-release-6.2 labels Aug 8, 2022
Copy link
Contributor

@yibin87 yibin87 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 8, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Aug 8, 2022
@sre-bot sre-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 8, 2022
@windtalker
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

@windtalker: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: 85b0f88

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 9, 2022
@sre-bot
Copy link
Collaborator

sre-bot commented Aug 9, 2022

Coverage for changed files

Filename                      Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
MPPTask.cpp                       448               448     0.00%          27                27     0.00%         434               434     0.00%         210               210     0.00%
MPPTask.h                           3                 3     0.00%           3                 3     0.00%           3                 3     0.00%           0                 0         -
MinTSOScheduler.cpp               326               293    10.12%           7                 6    14.29%         200               178    11.00%         166               161     3.01%
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                             777               744     4.25%          37                36     2.70%         637               615     3.45%         376               371     1.33%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18784      9448             49.70%    214115  95481        55.41%

full coverage report (for internal network access only)

@ti-chi-bot ti-chi-bot merged commit 06b5da5 into pingcap:release-6.2 Aug 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-6.2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants