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

resource_manager: replace MaxToken by BurstLimit #5931

Merged

Conversation

CabinfeverB
Copy link
Member

Signed-off-by: Cabinfever_B cabinfeveroier@gmail.com

What problem does this PR solve?

Issue Number: ref #5851

What is changed and how does it work?

  1. replace MaxToken by BurstLimit
  2. split TokenBucket into TokenLimitSettings and GroupTokenBucketState in GroupTokenBucket

Check List

Tests

  • Unit test
  • Integration test

Release note

None.

Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Feb 7, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JmPotato
  • 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 the release-note-none Denotes a PR that doesn't merit a release note. label Feb 7, 2023
@ti-chi-bot ti-chi-bot requested review from JmPotato and Yisaer February 7, 2023 12:26
@CabinfeverB CabinfeverB requested review from nolouch and disksing and removed request for Yisaer February 7, 2023 12:26
@codecov
Copy link

codecov bot commented Feb 7, 2023

Codecov Report

Base: 75.49% // Head: 75.51% // Increases project coverage by +0.02% 🎉

Coverage data is based on head (b191487) compared to base (cd381eb).
Patch coverage: 85.71% of modified lines in pull request are covered.

❗ Current head b191487 differs from pull request most recent head 7cfcfed. Consider uploading reports for the commit 7cfcfed to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5931      +/-   ##
==========================================
+ Coverage   75.49%   75.51%   +0.02%     
==========================================
  Files         346      346              
  Lines       35177    35166      -11     
==========================================
- Hits        26558    26557       -1     
+ Misses       6326     6319       -7     
+ Partials     2293     2290       -3     
Flag Coverage Δ
unittests 75.51% <85.71%> (+0.02%) ⬆️

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

Impacted Files Coverage Δ
pkg/mcs/resource_manager/server/resource_group.go 71.42% <66.66%> (ø)
pkg/mcs/resource_manager/server/token_bukets.go 93.25% <90.90%> (+3.01%) ⬆️
pkg/tso/local_allocator.go 64.86% <0.00%> (-10.82%) ⬇️
server/schedulers/random_merge.go 62.50% <0.00%> (-4.17%) ⬇️
server/schedulers/shuffle_hot_region.go 56.66% <0.00%> (-3.34%) ⬇️
pkg/tso/allocator_manager.go 64.35% <0.00%> (-2.91%) ⬇️
pkg/encryption/key_manager.go 70.11% <0.00%> (-1.60%) ⬇️
server/schedulers/hot_region_v2.go 88.30% <0.00%> (-1.17%) ⬇️
server/schedule/checker/rule_checker.go 81.29% <0.00%> (-1.04%) ⬇️
pkg/btree/btree_generic.go 86.34% <0.00%> (-0.93%) ⬇️
... and 33 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

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

@nolouch nolouch 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 Feb 8, 2023
@nolouch
Copy link
Contributor

nolouch commented Feb 8, 2023

ptal @JmPotato

Copy link
Member

@JmPotato JmPotato left a comment

Choose a reason for hiding this comment

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

The rest LGTM.

@@ -167,7 +167,7 @@ func FromProtoResourceGroup(group *rmpb.ResourceGroup) *ResourceGroup {
func (rg *ResourceGroup) RequestRU(now time.Time, neededTokens float64, targetPeriodMs uint64) *rmpb.GrantedRUTokenBucket {
rg.Lock()
defer rg.Unlock()
if rg.RUSettings == nil {
if rg.RUSettings == nil || rg.RUSettings.RU.Settings == nil {
Copy link
Member

Choose a reason for hiding this comment

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

Should we check whether rg.RUSettings.RU is nil?

Copy link
Member Author

Choose a reason for hiding this comment

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

rg.RUSettings.RU is not a pointer

@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 Feb 8, 2023
@JmPotato
Copy link
Member

JmPotato commented Feb 8, 2023

/merge

@ti-chi-bot
Copy link
Member

@JmPotato: 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

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

Commit hash: b191487

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 8, 2023
@ti-chi-bot
Copy link
Member

@CabinfeverB: Your PR was out of date, I have automatically updated it for you.

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.

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 ti-chi-bot merged commit 5811b9f into tikv:master Feb 8, 2023
@JmPotato JmPotato deleted the resource-manager/unify_burst_max branch February 8, 2023 09:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants