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

schedule: one operator only occupy one limit (#3820) #3858

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #3820

Signed-off-by: tongjian 1045931706@qq.com

What problem does this PR solve?

fix: #3807
#3778

What is changed and how it works?

operator controller's count will occupy the highest priority OpKind even if the operator has many OpKind.

the relation between limit and scheduler is blow:
image

red mark need to be changed

Check List

Tests

  • Unit test

Code changes

Side effects

Related changes

Release note

Reduce the conflict due to multiple scheduler running in same time

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved type/cherry-pick-for-release-4.0 The PR belongs to release-4.0 cherry pick. labels Jul 9, 2021
@nolouch
Copy link
Contributor

nolouch commented Jul 12, 2021

@bufferflies Please fix the conflicts.

Signed-off-by: nolouch <nolouch@gmail.com>
@nolouch
Copy link
Contributor

nolouch commented Jul 14, 2021

PTAL @bufferflies @HunDunDM

@codecov
Copy link

codecov bot commented Jul 14, 2021

Codecov Report

Merging #3858 (a722bfb) into release-4.0 (09a7830) will increase coverage by 0.14%.
The diff coverage is 100.00%.

❗ Current head a722bfb differs from pull request most recent head 66cf400. Consider uploading reports for the commit 66cf400 to get more accurate results
Impacted file tree graph

@@               Coverage Diff               @@
##           release-4.0    #3858      +/-   ##
===============================================
+ Coverage        74.70%   74.85%   +0.14%     
===============================================
  Files              211      211              
  Lines            19994    19992       -2     
===============================================
+ Hits             14937    14965      +28     
+ Misses            3721     3702      -19     
+ Partials          1336     1325      -11     
Flag Coverage Δ
unittests 74.85% <100.00%> (+0.14%) ⬆️

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

Impacted Files Coverage Δ
server/schedule/operator/kind.go 100.00% <ø> (ø)
server/schedule/operator/operator.go 96.52% <100.00%> (+0.03%) ⬆️
server/schedule/operator_controller.go 81.01% <100.00%> (-0.12%) ⬇️
server/schedulers/balance_region.go 85.15% <100.00%> (ø)
server/heartbeat_streams.go 65.93% <0.00%> (-6.60%) ⬇️
pkg/dashboard/adapter/manager.go 80.85% <0.00%> (-4.26%) ⬇️
server/member/leader.go 66.05% <0.00%> (-2.76%) ⬇️
server/tso/tso.go 78.98% <0.00%> (-1.45%) ⬇️
pkg/btree/btree.go 85.30% <0.00%> (-0.97%) ⬇️
server/cluster/cluster.go 78.60% <0.00%> (+0.47%) ⬆️
... and 10 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 09a7830...66cf400. Read the comment docs.

@nolouch nolouch force-pushed the cherry-pick-3820-to-release-4.0 branch from 4ce9e11 to e12ce7a Compare July 15, 2021 04:11
Signed-off-by: nolouch <nolouch@gmail.com>
@nolouch nolouch force-pushed the cherry-pick-3820-to-release-4.0 branch from e12ce7a to 66cf400 Compare July 15, 2021 04:14
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 15, 2021
@bufferflies
Copy link
Contributor

lgtm

@ti-chi-bot
Copy link
Member Author

[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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 15, 2021
@nolouch
Copy link
Contributor

nolouch commented Jul 15, 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: 66cf400

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 15, 2021
@ti-chi-bot ti-chi-bot merged commit 11497a4 into tikv:release-4.0 Jul 15, 2021
@HunDunDM HunDunDM added this to the v4.0.14 milestone Jul 16, 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. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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