client/controller: record context error and add slowlog about token bucket #8344

nolouch · 2024-06-27T11:14:20Z

What problem does this PR solve?

Issue Number: Close #8343

What is changed and how does it work?

client/controller: record context error and add slowlog about token bucket
- record low process start time, and log it if it's too slow
- record the context error

Check List

Tests

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

Release note

None.

…ucket request Signed-off-by: Shuning Chen <[email protected]>

HuSharp · 2024-07-02T06:28:40Z

client/resource_group/controller/limiter.go

@@ -218,7 +224,8 @@ func (lim *Limiter) Reserve(ctx context.Context, waitDuration time.Duration, now
 	select {
 	case <-ctx.Done():
 		return &Reservation{
-			ok: false,
+			ok:  false,
+			err: ctx.Err(),


Can we use err instead of ok? That would add ErrClientResourceGroupThrottled to err.

ok is only used for can if reserved enough tokens, but the error may include others like ctx.Error().

let's keep min changes in this PR first, I don't want to bring potential risks to other branches by picking.

client/resource_group/controller/controller.go

Signed-off-by: Shuning Chen <[email protected]>

client/resource_group/controller/limiter.go

Signed-off-by: Shuning Chen <[email protected]>

ti-chi-bot · 2024-07-02T09:14:30Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: HuSharp, JmPotato

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [HuSharp,JmPotato]

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

ti-chi-bot · 2024-07-02T09:14:33Z

[LGTM Timeline notifier]

Timeline:

2024-07-02 08:34:47.479373617 +0000 UTC m=+1313413.964862441: ☑️ agreed by HuSharp.
2024-07-02 09:14:32.10849359 +0000 UTC m=+1315798.593982421: ☑️ agreed by JmPotato.

ti-chi-bot · 2024-07-02T09:27:42Z

@nolouch: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-integration-realcluster-test	`136fc44`	link	false	`/test pull-integration-realcluster-test`

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

nolouch · 2024-07-02T10:08:17Z

/run-cherry-picker

close tikv#8343 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2024-07-02T10:08:50Z

In response to a cherrypick label: new pull request created to branch release-7.1: #8354.

ti-chi-bot · 2024-07-02T10:08:50Z

In response to a cherrypick label: new pull request created to branch release-7.5: #8355.

close tikv#8343 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2024-07-02T10:08:51Z

In response to a cherrypick label: new pull request created to branch release-8.1: #8356.

…ucket (#8344) (#8355) close #8343, ref #8349 client/controller: record context error and add slowlog about token bucket - record low process start time, and log it if it's too slow - record the context error Signed-off-by: ti-chi-bot <[email protected]> Signed-off-by: Shuning Chen <[email protected]> Co-authored-by: ShuNing <[email protected]> Co-authored-by: Shuning Chen <[email protected]>

…ucket (#8344) (#8356) close #8343, ref #8349 client/controller: record context error and add slowlog about token bucket - record low process start time, and log it if it's too slow - record the context error Signed-off-by: ti-chi-bot <[email protected]> Signed-off-by: Shuning Chen <[email protected]> Co-authored-by: ShuNing <[email protected]> Co-authored-by: Shuning Chen <[email protected]>

nolouch · 2024-07-04T07:13:35Z

/run-cherry-picker

ti-chi-bot · 2024-07-04T07:14:00Z

In response to a cherrypick label: new pull request created to branch release-8.2: #8363.

…ucket (#8344) (#8354) close #8343, ref #8349 client/controller: record context error and add slowlog about token bucket - record low process start time, and log it if it's too slow - record the context error Signed-off-by: ti-chi-bot <[email protected]> Signed-off-by: Shuning Chen <[email protected]> Co-authored-by: ShuNing <[email protected]> Co-authored-by: Shuning Chen <[email protected]>

…ucket (#8344) (#8363) * client/controller: record context error and add slowlog about token bucket request Signed-off-by: Shuning Chen <[email protected]>

…ucket (tikv#8344) (tikv#8355) close tikv#8343, ref tikv#8349 client/controller: record context error and add slowlog about token bucket - record low process start time, and log it if it's too slow - record the context error Signed-off-by: ti-chi-bot <[email protected]> Signed-off-by: Shuning Chen <[email protected]> Co-authored-by: ShuNing <[email protected]> Co-authored-by: Shuning Chen <[email protected]>

…ucket (tikv#8344) (tikv#8355) close tikv#8343, ref tikv#8349 client/controller: record context error and add slowlog about token bucket - record low process start time, and log it if it's too slow - record the context error Signed-off-by: Shuning Chen <[email protected]>

…he local bucket (#8352) (#8365) * client/controller: record context error and add slowlog about token bucket (#8344) (#8355) close #8343, ref #8349 client/controller: record context error and add slowlog about token bucket - record low process start time, and log it if it's too slow - record the context error Signed-off-by: Shuning Chen <[email protected]> * This is an automated cherry-pick of #8352 close #8349 Signed-off-by: nolouch <[email protected]> Signed-off-by: Shuning Chen <[email protected]> --------- Signed-off-by: Shuning Chen <[email protected]> Signed-off-by: nolouch <[email protected]> Co-authored-by: Ti Chi Robot <[email protected]>

ti-chi-bot bot added do-not-merge/needs-triage-completed release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has signed the dco. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 27, 2024

nolouch force-pushed the fix-missing-error branch from 4e5bdb3 to 725ece1 Compare July 1, 2024 07:46

ti-chi-bot bot removed the do-not-merge/needs-triage-completed label Jul 1, 2024

nolouch force-pushed the fix-missing-error branch 3 times, most recently from 5109730 to 9482860 Compare July 2, 2024 03:42

client/controller: record context error and add slowlog about token b…

90cf6c3

…ucket request Signed-off-by: Shuning Chen <[email protected]>

nolouch force-pushed the fix-missing-error branch from 9482860 to 90cf6c3 Compare July 2, 2024 03:47

nolouch added affects-7.5 affects-8.1 affects-7.1 labels Jul 2, 2024

nolouch requested review from JmPotato and HuSharp July 2, 2024 04:00

HuSharp reviewed Jul 2, 2024

View reviewed changes

client/resource_group/controller/controller.go Outdated Show resolved Hide resolved

HuSharp reviewed Jul 2, 2024

View reviewed changes

client/resource_group/controller/controller.go Show resolved Hide resolved

address

a6958c9

Signed-off-by: Shuning Chen <[email protected]>

HuSharp approved these changes Jul 2, 2024

View reviewed changes

ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Jul 2, 2024

JmPotato reviewed Jul 2, 2024

View reviewed changes

client/resource_group/controller/limiter.go Outdated Show resolved Hide resolved

address

18fad8b

Signed-off-by: Shuning Chen <[email protected]>

JmPotato approved these changes Jul 2, 2024

View reviewed changes

ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jul 2, 2024

Merge branch 'master' into fix-missing-error

136fc44

ti-chi-bot bot merged commit 49f9b11 into tikv:master Jul 2, 2024
16 of 17 checks passed

nolouch deleted the fix-missing-error branch July 2, 2024 09:54

nolouch added needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. labels Jul 2, 2024

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Jul 2, 2024

This is an automated cherry-pick of tikv#8344

f54cc7c

close tikv#8343 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Jul 2, 2024

This is an automated cherry-pick of tikv#8344

e07be6a

close tikv#8343 Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Jul 2, 2024

This is an automated cherry-pick of tikv#8344

e2508b6

close tikv#8343 Signed-off-by: ti-chi-bot <[email protected]>

nolouch added the needs-cherry-pick-release-8.2 label Jul 4, 2024

ti-chi-bot mentioned this pull request Jul 4, 2024

client/controller: record context error and add slowlog about token bucket (#8344) #8363

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

client/controller: record context error and add slowlog about token bucket #8344

client/controller: record context error and add slowlog about token bucket #8344

nolouch commented Jun 27, 2024 •

edited

Loading

HuSharp Jul 2, 2024 •

edited

Loading

nolouch Jul 2, 2024 •

edited

Loading

ti-chi-bot bot commented Jul 2, 2024

ti-chi-bot bot commented Jul 2, 2024

ti-chi-bot bot commented Jul 2, 2024

nolouch commented Jul 2, 2024

ti-chi-bot commented Jul 2, 2024

ti-chi-bot commented Jul 2, 2024

ti-chi-bot commented Jul 2, 2024

nolouch commented Jul 4, 2024

ti-chi-bot commented Jul 4, 2024

client/controller: record context error and add slowlog about token bucket #8344

client/controller: record context error and add slowlog about token bucket #8344

Conversation

nolouch commented Jun 27, 2024 • edited Loading

What problem does this PR solve?

What is changed and how does it work?

Check List

Release note

HuSharp Jul 2, 2024 • edited Loading

Choose a reason for hiding this comment

nolouch Jul 2, 2024 • edited Loading

Choose a reason for hiding this comment

ti-chi-bot bot commented Jul 2, 2024

ti-chi-bot bot commented Jul 2, 2024

[LGTM Timeline notifier]

ti-chi-bot bot commented Jul 2, 2024

nolouch commented Jul 2, 2024

ti-chi-bot commented Jul 2, 2024

ti-chi-bot commented Jul 2, 2024

ti-chi-bot commented Jul 2, 2024

nolouch commented Jul 4, 2024

ti-chi-bot commented Jul 4, 2024

nolouch commented Jun 27, 2024 •

edited

Loading

HuSharp Jul 2, 2024 •

edited

Loading

nolouch Jul 2, 2024 •

edited

Loading