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.

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

support tiflash resource control #7656

Closed
wants to merge 41 commits into from
Closed

support tiflash resource control #7656

wants to merge 41 commits into from

Conversation

guo-shaoge
Copy link
Contributor

@guo-shaoge guo-shaoge commented Jun 14, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: close #7660

Problem Summary:

What is changed and how it works?

  1. TokenBucket: two mode:
    1. static: store static number of tokens, and fetch from GAC if in low token state(0.8 * init token)
    2. dynamic: got a fill_rate, which means will fill n tokens per second.
  2. LocalAdmissionControl:
    1. A background thread talks with GAC to fetch tokens and changes of ResourceGroup(like delete or config change).
    2. Manage all ResourceGroup meta, so we can change ResourceGroup state(like reamaing RU) or get ResourceGroup state(like priority) through LAC::global_instance.
  3. ResourceControlQueue: This is a Queue for Pipeline TaskScheduler
    1. submit: check which ResourceGroup this task belongs to, then submit this task into specific TaskQueue.
    2. take: Using LAC to get the ResourceGroup of hightest priority, then take task from this ResourceGroup.
  4. MinTSO related changes
    1. There will be one MinTSO for each ResourceGroup insteal of having a MinTSO for a tiflash instance.
    2. A mpp task hard limit is added, when the active_set of MinTSO of all non throllted ResourceGroup exceeds hard limit, will give error for all new incoming mpptask.

Check List

Tests

  • Unit test: wip
  • 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

guo-shaoge added 5 commits June 8, 2023 21:39
@guo-shaoge
tmp save
e708b47 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
ResourceControlQueue done basically
22ba269 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
compile
150602f 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
add todo
56a72f7 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
fix
3d652b2 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jun 14, 2023
@guo-shaoge
add keyspace
e2c8399 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
Merge branch 'master' of github.com:pingcap/tiflash into resource_con…
8c3384d 
…trol

Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
fmt
da49220 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
refine MinTSO related code
03bb3b8 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
Copy link
Contributor Author

/hold

@ti-chi-bot ti-chi-bot bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 14, 2023
@guo-shaoge guo-shaoge closed this Jun 14, 2023
@guo-shaoge
remove resource group mintso gracefully
e5d645a 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge guo-shaoge reopened this Jun 14, 2023
@guo-shaoge
refine comment and mintso config
ac0b144 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
guo-shaoge
guo-shaoge commented Jun 14, 2023
View reviewed changes
dbms/src/Flash/Pipeline/Schedule/TaskQueues/ResourceControlQueue.h Outdated
using ResourceGroupNameSet = std::unordered_set<std::string>;

// Update used cpu time of resource group.
void updateResourceGroupResource(const std::string & name, const KeyspaceID & keyspace_id, UInt64 consumed_cpu_time);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

todo: change name, like updateResourceGroupStatics

@guo-shaoge
refine ResourceControlQueue
3aaae89 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
refine priority_queue
5c72ae9 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
guo-shaoge
guo-shaoge commented Jun 16, 2023
View reviewed changes
dbms/src/Flash/ResourceControl/LocalAdmissionController.h

void setupUniqueClientID()
{
// todo: need etcd client.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Next PR

@ti-chi-bot ti-chi-bot bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 23, 2023
@guo-shaoge
tmp save
9cfb00c 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
refine MPPTaskManager
709bc06 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jul 4, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from guo-shaoge. For more information see the Kubernetes Code Review Process.

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

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

guo-shaoge added 2 commits July 4, 2023 14:54
@guo-shaoge
refine comments
8a5d5fc 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
refine ResourceControlQueue
f76b5ad 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
guo-shaoge added 2 commits July 5, 2023 15:47
@guo-shaoge
fix IOPriorityQueue and calc priority by ru_per_sec
b65e9e0 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
fix data member
dc16009 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@ti-chi-bot ti-chi-bot bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 6, 2023
guo-shaoge added 4 commits July 7, 2023 19:49
@guo-shaoge
fix avg_speed always <= 0
8ff6b20 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
fix DAGContext.resource_group_name
8113329 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
Merge branch 'master' of github.com:pingcap/tiflash into resource_con…
5c719fc 
…trol

Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
fix exec_context
e0f5d0f 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@ti-chi-bot ti-chi-bot bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 1, 2023
@guo-shaoge
refine log
d256169 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
refine
fc5ac2e 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
add gtest
4c844ac 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
refine ResourceControlQueue::take()
58d09a3 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
fix gtest
5626c87 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
TestResourceGroup.BasicTest ok
9d328cf 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
refine MockLocalAdmissionController
001993a 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
add gtest CPUUsageProportion
fe76070 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
refine TaskQueue::take semantics to drain all tasks when finished
5c9c911 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@ti-chi-bot ti-chi-bot bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 7, 2023
@guo-shaoge
refine ut
69f0883 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
fix compile(ENABLE_TESTS)
187a744 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
tmp save
631ecd0 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
Merge branch 'master' of github.com:pingcap/tiflash into resource_con…
4875db5 
…trol

Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
refine case
364c21d 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@ti-chi-bot ti-chi-bot bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 8, 2023
@ti-chi-bot ti-chi-bot bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 10, 2023
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 10, 2023

PR needs rebase.

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 kubernetes/test-infra repository.

@guo-shaoge
Copy link
Contributor Author

#7917

@guo-shaoge guo-shaoge closed this Aug 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

support tiflash resource control
1 participant
@guo-shaoge