Skip to content

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

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Sep 14, 2021
Merged

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

merged 1 commit into from
Sep 14, 2021

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #3967

Signed-off-by: lhy1024 admin@liudos.us

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 •
edited
Loading

[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 do-not-merge/cherry-pick-not-approved release-note-none Denotes a PR that doesn't merit a release note. component/scheduler Scheduler logic. type/cherry-pick-for-release-5.1 The PR belongs to release-5.1 cherry pick. labels Aug 12, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request Aug 12, 2021
Merged
@ti-chi-bot ti-chi-bot requested review from disksing and lhy1024 August 12, 2021 07:09
@lhy1024
Copy link
Contributor

lhy1024 commented Aug 12, 2021

it will wait until cherry-pick of #3870 merged

@disksing disksing removed their request for review August 24, 2021 03:38
@lhy1024 lhy1024 added this to the v5.1.2 milestone Sep 1, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Sep 13, 2021
@lhy1024
update
ad06fbf 
Signed-off-by: lhy1024 <admin@liudos.us>
@lhy1024 lhy1024 force-pushed the cherry-pick-3967-to-release-5.1 branch from e8457f7 to ad06fbf Compare September 13, 2021 20:21
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 14, 2021
@HunDunDM
Copy link
Member

/run-unit-test

@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 14, 2021
@nolouch
Copy link
Contributor

nolouch commented Sep 14, 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: ad06fbf

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 14, 2021
@codecov
Copy link

codecov bot commented Sep 14, 2021 •
edited
Loading

Codecov Report

Merging #3976 (ad06fbf) into release-5.1 (2d1a00a) will increase coverage by 0.17%.
The diff coverage is 75.00%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release-5.1    #3976      +/-   ##
===============================================
+ Coverage        75.11%   75.29%   +0.17%     
===============================================
  Files              245      245              
  Lines            24634    24642       +8     
===============================================
+ Hits             18505    18553      +48     
+ Misses            4509     4482      -27     
+ Partials          1620     1607      -13
Flag Coverage Δ
unittests 75.29% <75.00%> (+0.17%) ⬆️

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

Impacted Files Coverage Δ
pkg/mock/mockcluster/mockcluster.go 95.28% <66.66%> (-0.44%) ⬇️
server/schedulers/hot_region.go 84.87% <100.00%> (+0.04%) ⬆️
server/kv/etcd_kv.go 79.71% <0.00%> (-5.80%) ⬇️
server/tso/tso.go 73.03% <0.00%> (-1.69%) ⬇️
server/schedule/operator/step.go 67.44% <0.00%> (-1.67%) ⬇️
pkg/btree/btree.go 85.30% <0.00%> (-0.97%) ⬇️
server/tso/allocator_manager.go 78.29% <0.00%> (-0.67%) ⬇️
server/grpc_service.go 48.11% <0.00%> (-0.23%) ⬇️
client/base_client.go 82.98% <0.00%> (+0.51%) ⬆️
server/cluster/coordinator.go 74.03% <0.00%> (+0.72%) ⬆️
... and 12 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 2d1a00a...ad06fbf. Read the comment docs.

@ti-chi-bot ti-chi-bot merged commit bda68d5 into tikv:release-5.1 Sep 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nolouch nolouch nolouch approved these changes

@HunDunDM HunDunDM HunDunDM approved these changes

@lhy1024 lhy1024 Awaiting requested review from lhy1024

@Yisaer Yisaer Awaiting requested review from Yisaer

Assignees

@lhy1024 lhy1024

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-5.1 The PR belongs to release-5.1 cherry pick.
Projects
None yet
Milestone
v5.1.2
Development

Successfully merging this pull request may close these issues.
5 participants
@ti-chi-bot @lhy1024 @HunDunDM @nolouch @zhouqiang-cl