pkg/ratelimit: refactor for BBR #7239

CabinfeverB · 2023-10-19T15:47:01Z

What problem does this PR solve?

Issue Number: ref #7167

What is changed and how does it work?

The previous Limiter was renamed MultiLimiter.
The new Limiter holds rateli-miter and concurrency-limiter. So MultiLimiter only holds a sync.Map.

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
No code

Code changes

Has the configuration change
Has HTTP API interfaces changed (Don't forget to add the declarative for the new API)
Has persistent data change

Side effects

Possible performance regression
Increased code complexity
Breaking backward compatibility

Related changes

PR to update pingcap/docs/pingcap/docs-cn:
PR to update pingcap/tiup:
Need to cherry-pick to the release branch

Release note

None.

Signed-off-by: Cabinfever_B <[email protected]>

ti-chi-bot · 2023-10-19T15:47:04Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

nolouch
rleungx

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.

Signed-off-by: Cabinfever_B <[email protected]>

codecov · 2023-10-22T15:43:37Z

Codecov Report

Merging #7239 (fbc2ba2) into master (1eed494) will increase coverage by 0.15%.
Report is 1 commits behind head on master.
The diff coverage is 80.00%.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #7239      +/-   ##
==========================================
+ Coverage   74.48%   74.63%   +0.15%     
==========================================
  Files         453      454       +1     
  Lines       50079    50120      +41     
==========================================
+ Hits        37300    37408     +108     
+ Misses       9439     9382      -57     
+ Partials     3340     3330      -10

Flag	Coverage Δ
unittests	`74.63% <80.00%> (+0.15%)`	⬆️

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

rleungx · 2023-10-23T03:34:27Z

pkg/ratelimit/limiter.go

@@ -1,4 +1,4 @@
-// Copyright 2022 TiKV Project Authors.
+// Copyright 2023 TiKV Project Authors.


no need to change

This is because limiter.go is a new file, and the previous limiter.go has become multi_limiter.go.
IDK whether need to change.

pkg/ratelimit/limiter_test.go

rleungx · 2023-10-23T09:37:18Z

pkg/ratelimit/multi_limiter.go

+var emptyFunc = func() {}
+
+// MultiLimiter is a controller which holds multiple limiters to manage the request rate of different objects.
+type MultiLimiter struct {


How about naming it controller?

Good suggestion!

Signed-off-by: Cabinfever_B <[email protected]>

rleungx · 2023-11-09T02:52:28Z

pkg/ratelimit/limiter.go

-	}
+func (l *limiter) deleteConcurrency() bool {
+	l.mu.RLock()
+	defer l.mu.RUnlock()


rleungx · 2023-11-09T02:53:49Z

pkg/ratelimit/controller_test.go

@@ -0,0 +1,426 @@
+// Copyright 2022 TiKV Project Authors.


Suggested change

// Copyright 2022 TiKV Project Authors.

// Copyright 2023 TiKV Project Authors.

Signed-off-by: Cabinfever_B <[email protected]> address comment Signed-off-by: Cabinfever_B <[email protected]>

rleungx

The rest LGTM

rleungx · 2023-11-09T05:17:52Z

pkg/ratelimit/limiter.go

+func (l *limiter) updateQPSConfig(limit float64, burst int) UpdateStatus {
+	oldQPSLimit, oldBurst := l.getQPSLimiterStatus()
+
+	if (float64(oldQPSLimit)-limit < eps && float64(oldQPSLimit)-limit > -eps) && oldBurst == burst {


Does it mean abs?

Signed-off-by: Cabinfever_B <[email protected]>

nolouch

lgtm

nolouch · 2023-12-13T08:40:58Z

/merge

ti-chi-bot · 2023-12-13T08:41:00Z

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

/run-all-tests

You only need to trigger /merge once, and 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.

If you have any questions about the PR merge process, please refer to pr process.

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 · 2023-12-13T08:41:02Z

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

Commit hash: 4748cf5

ti-chi-bot · 2023-12-13T08:41:15Z

@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.

CabinfeverB · 2023-12-13T09:18:26Z

/rebuild

CabinfeverB · 2023-12-13T09:18:59Z

/test build

CabinfeverB added 2 commits October 19, 2023 14:19

refactor ratelimit pkg

b8be11c

Signed-off-by: Cabinfever_B <[email protected]>

refactor ratelimit pkg

5c242b8

Signed-off-by: Cabinfever_B <[email protected]>

ti-chi-bot bot added the release-note-none Denotes a PR that doesn't merit a release note. label Oct 19, 2023

ti-chi-bot bot requested review from nolouch and rleungx October 19, 2023 15:47

ti-chi-bot bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 19, 2023

CabinfeverB mentioned this pull request Oct 19, 2023

Tracking issue for self-adaptive rate limit in self protection #7167

Open

12 tasks

ti-chi-bot bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 19, 2023

refactor test

b8cde6f

Signed-off-by: Cabinfever_B <[email protected]>

ti-chi-bot bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 22, 2023

rleungx reviewed Oct 23, 2023

View reviewed changes

CabinfeverB added 3 commits October 23, 2023 19:20

address comment

753c9d4

Signed-off-by: Cabinfever_B <[email protected]>

Merge branch 'master' into rate_limit/refactor

9fb345f

address comment

8c6a990

Signed-off-by: Cabinfever_B <[email protected]>

ti-chi-bot bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 23, 2023

address comment

12d9529

Signed-off-by: Cabinfever_B <[email protected]>

ti-chi-bot bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 23, 2023

CabinfeverB mentioned this pull request Oct 26, 2023

ratelimit: impl BBR-like algorithm #7246

Open

rleungx reviewed Nov 9, 2023

View reviewed changes

pkg/ratelimit/limiter.go Outdated

}

func (l *limiter) deleteConcurrency() bool {

l.mu.RLock()

defer l.mu.RUnlock()

Copy link

Member

rleungx Nov 9, 2023

Choose a reason for hiding this comment

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

Rlock?

rleungx reviewed Nov 9, 2023

View reviewed changes

address comment

a815282

Signed-off-by: Cabinfever_B <[email protected]> address comment Signed-off-by: Cabinfever_B <[email protected]>

rleungx approved these changes Nov 9, 2023

View reviewed changes

ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 9, 2023

address comment

4748cf5

Signed-off-by: Cabinfever_B <[email protected]>

CabinfeverB mentioned this pull request Dec 13, 2023

*: add API concurrency metrics #7541

Merged

nolouch approved these changes Dec 13, 2023

View reviewed changes

ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Dec 13, 2023

ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 13, 2023

Merge branch 'master' into rate_limit/refactor

fbc2ba2

ti-chi-bot bot merged commit cf718a7 into tikv:master Dec 13, 2023
26 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

pkg/ratelimit: refactor for BBR #7239

pkg/ratelimit: refactor for BBR #7239

CabinfeverB commented Oct 19, 2023 •

edited

Loading

ti-chi-bot bot commented Oct 19, 2023 •

edited

Loading

codecov bot commented Oct 22, 2023 •

edited

Loading

rleungx Oct 23, 2023

CabinfeverB Oct 23, 2023

rleungx Oct 23, 2023

CabinfeverB Oct 23, 2023

rleungx Nov 9, 2023

rleungx Nov 9, 2023

rleungx left a comment

rleungx Nov 9, 2023

CabinfeverB Nov 9, 2023

nolouch left a comment

nolouch commented Dec 13, 2023

ti-chi-bot bot commented Dec 13, 2023

ti-chi-bot bot commented Dec 13, 2023

ti-chi-bot bot commented Dec 13, 2023

CabinfeverB commented Dec 13, 2023

CabinfeverB commented Dec 13, 2023

		@@ -1,4 +1,4 @@
		// Copyright 2022 TiKV Project Authors.
		// Copyright 2023 TiKV Project Authors.

pkg/ratelimit: refactor for BBR #7239

pkg/ratelimit: refactor for BBR #7239

Conversation

CabinfeverB commented Oct 19, 2023 • edited Loading

What problem does this PR solve?

What is changed and how does it work?

Check List

Release note

ti-chi-bot bot commented Oct 19, 2023 • edited Loading

codecov bot commented Oct 22, 2023 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rleungx left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nolouch left a comment

Choose a reason for hiding this comment

nolouch commented Dec 13, 2023

ti-chi-bot bot commented Dec 13, 2023

ti-chi-bot bot commented Dec 13, 2023

ti-chi-bot bot commented Dec 13, 2023

CabinfeverB commented Dec 13, 2023

CabinfeverB commented Dec 13, 2023

CabinfeverB commented Oct 19, 2023 •

edited

Loading

ti-chi-bot bot commented Oct 19, 2023 •

edited

Loading

codecov bot commented Oct 22, 2023 •

edited

Loading