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

scheduler: consider evict leader when calc expect (#3967) #3974

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #3967

Signed-off-by: lhy1024 [email protected]

What problem does this PR solve?

fix #3959

What is changed and how it works?

  1. consider evict leader when calc expect
  2. reduce the pending amp factor
  3. unify qps and query as query, to ensure consistency with the documentation pd-control: add new config of balance-hot-region-scheduler pingcap/docs-cn#6835

Check List

Tests

  • Unit test

Related changes

Release note

None.

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Aug 12, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • HunDunDM
  • nolouch

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 component/scheduler Scheduler logic. type/cherry-pick-for-release-4.0 The PR belongs to release-4.0 cherry pick. labels Aug 12, 2021
@ti-chi-bot ti-chi-bot requested review from lhy1024 and rleungx August 12, 2021 07:08
@lhy1024
Copy link
Contributor

lhy1024 commented Aug 12, 2021

it will wait until cherry-pick of #3870 merged

@lhy1024 lhy1024 added this to the v4.0.15 milestone Sep 1, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Sep 3, 2021
@ti-chi-bot ti-chi-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed do-not-merge/cherry-pick-not-approved labels Sep 3, 2021
Signed-off-by: lhy1024 <[email protected]>
@lhy1024 lhy1024 force-pushed the cherry-pick-3967-to-release-4.0 branch from f0fe8cc to 7f5012a Compare September 6, 2021 14:28
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 6, 2021
@codecov
Copy link

codecov bot commented Sep 6, 2021

Codecov Report

Merging #3974 (3c3265e) into release-4.0 (d45165b) will increase coverage by 0.02%.
The diff coverage is 75.00%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release-4.0    #3974      +/-   ##
===============================================
+ Coverage        74.73%   74.75%   +0.02%     
===============================================
  Files              211      211              
  Lines            20020    20028       +8     
===============================================
+ Hits             14962    14972      +10     
- Misses            3720     3725       +5     
+ Partials          1338     1331       -7     
Flag Coverage Δ
unittests 74.75% <75.00%> (+0.02%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
pkg/mock/mockcluster/mockcluster.go 92.56% <66.66%> (-0.50%) ⬇️
server/schedulers/hot_region.go 80.92% <100.00%> (+0.05%) ⬆️
server/schedulers/shuffle_hot_region.go 57.14% <0.00%> (-12.50%) ⬇️
server/member/leader.go 65.13% <0.00%> (-0.92%) ⬇️
client/client.go 69.03% <0.00%> (-0.51%) ⬇️
server/grpc_service.go 59.07% <0.00%> (-0.41%) ⬇️
server/cluster/cluster.go 78.60% <0.00%> (+0.47%) ⬆️
server/core/storage.go 68.39% <0.00%> (+0.86%) ⬆️
server/server.go 74.75% <0.00%> (+1.94%) ⬆️
server/schedule/operator/step.go 64.02% <0.00%> (+2.15%) ⬆️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d45165b...3c3265e. Read the comment docs.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 6, 2021
@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 Sep 7, 2021
@nolouch
Copy link
Contributor

nolouch commented Sep 7, 2021

/merge

@ti-chi-bot
Copy link
Member Author

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

/run-all-tests

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: 7f5012a

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 7, 2021
@ti-chi-bot ti-chi-bot merged commit 785ae5e into tikv:release-4.0 Sep 7, 2021
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. component/scheduler Scheduler logic. release-note-none Denotes a PR that doesn't merit a release note. 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-4.0 The PR belongs to release-4.0 cherry pick.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants