pkg: remove old duplicated task #8234

rleungx · 2024-05-31T06:57:31Z

What problem does this PR solve?

Issue Number: ref #7897.

What is changed and how does it work?

Check List

Tests

Unit test

Release note

None.

ti-chi-bot · 2024-05-31T06:57:33Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

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.

codecov · 2024-05-31T07:10:19Z

Codecov Report

Attention: Patch coverage is 85.41667% with 7 lines in your changes missing coverage. Please review.

Project coverage is 77.36%. Comparing base (9348164) to head (746e7f1).

❗ Current head 746e7f1 differs from pull request most recent head c10679d

Please upload reports for the commit c10679d to get more accurate results.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #8234      +/-   ##
==========================================
+ Coverage   77.28%   77.36%   +0.07%     
==========================================
  Files         471      471              
  Lines       61383    61395      +12     
==========================================
+ Hits        47441    47497      +56     
+ Misses      10382    10338      -44     
  Partials     3560     3560

Flag	Coverage Δ
unittests	`77.36% <85.41%> (+0.07%)`	⬆️

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

Signed-off-by: Ryan Leung <[email protected]>

pkg/core/region.go

Signed-off-by: Ryan Leung <[email protected]>

nolouch · 2024-06-04T07:07:55Z

pkg/ratelimit/runner.go

@@ -42,16 +42,16 @@ const (

 // Runner is the interface for running tasks.
 type Runner interface {
-	RunTask(ctx context.Context, name string, f func(context.Context), opts ...TaskOption) error
+	RunTask(id, name string, f func(), opts ...TaskOption) error


I think RunTask(id uint64, name string, f func(), opts ...TaskOption) error is ok. fmt.Sprint has an allocation cost.

But the same id may have different tasks. If we don't use fmt.Sprint, then we need a map[uint64]map[string]struct{}.

package main import ( "fmt" "strings" "testing" ) func BenchmarkSprintfKey(b *testing.B) { m := make(map[string]int) b.ReportAllocs() for i := 0; i < b.N; i++ { key := fmt.Sprintf("%s %s", "hello", "world") m[key]++ } } func BenchmarkStructKey(b *testing.B) { type myKey struct{ id int64 name string } m := make(map[myKey]int) b.ReportAllocs() for i := 0; i < b.N; i++ { key := myKey{id: 1, name: "test"} m[key]++ } }

➜ bench_sprintf go test -bench=. -benchmem goos: darwin goarch: arm64 pkg: bench BenchmarkSprintfKey-12 20207793 60.09 ns/op 16 B/op 1 allocs/op BenchmarkStructKey-12 83140879 14.91 ns/op 0 B/op 0 allocs/op

okJiang · 2024-06-04T07:25:58Z

pkg/ratelimit/runner.go

@@ -188,22 +193,25 @@ func (cr *ConcurrentRunner) RunTask(ctx context.Context, name string, f func(con

 	pendingTaskNum := len(cr.pendingTasks)
 	if pendingTaskNum > 0 {
+		if t, ok := cr.pendingRegionTasks[task.id]; ok {
+			t.f = f


Can you add a comment to explain the function will be overwrite and it doesn't matter

rest lgtm

Signed-off-by: Ryan Leung <[email protected]>

ti-chi-bot · 2024-06-04T09:57:24Z

@okJiang: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

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.

okJiang · 2024-06-04T09:57:45Z

pkg/ratelimit/runner.go

 	Start()
 	Stop()
 }

 // Task is a task to be run.
 type Task struct {
-	ctx         context.Context
+	id          uint64


can use taskID directly

I think it's ok and use less memory.

JmPotato · 2024-06-12T09:54:52Z

pkg/ratelimit/runner.go

@@ -61,16 +61,23 @@ type Task struct {
 var ErrMaxWaitingTasksExceeded = errors.New("max waiting tasks exceeded")

 // ConcurrentRunner is a simple task runner that limits the number of concurrent tasks.


It's a mismatched comment line.

ti-chi-bot · 2024-06-12T09:57:27Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JmPotato, nolouch, okJiang

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~~ [JmPotato,nolouch]

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-06-12T09:57:28Z

[LGTM Timeline notifier]

Timeline:

2024-06-12 09:57:27.973382922 +0000 UTC m=+545002.026694843: ☑️ agreed by JmPotato.

Signed-off-by: Ryan Leung <[email protected]>

rleungx · 2024-06-13T02:22:40Z

/merge

ti-chi-bot · 2024-06-13T02:22:42Z

@rleungx: We have migrated to builtin LGTM and approve plugins for reviewing.

👉 Please use /approve when you want approve this pull request.

The changes announcement: Proposal: Strengthen configuration change approval.

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 · 2024-06-13T02:49:34Z

@rleungx: 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 bot added do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. labels May 31, 2024

ti-chi-bot bot requested review from lhy1024 and nolouch May 31, 2024 06:57

ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed do-not-merge/needs-linked-issue labels May 31, 2024

rleungx removed request for nolouch and lhy1024 May 31, 2024 07:03

remove old duplicated task

2d43787

Signed-off-by: Ryan Leung <[email protected]>

rleungx force-pushed the dup branch from 75a0028 to 2d43787 Compare May 31, 2024 07:54

add unit test

02b6f89

Signed-off-by: Ryan Leung <[email protected]>

ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 31, 2024

rleungx added 2 commits May 31, 2024 16:34

remove context

bfcceb3

Signed-off-by: Ryan Leung <[email protected]>

change back to slice

3772233

Signed-off-by: Ryan Leung <[email protected]>

nolouch reviewed May 31, 2024

View reviewed changes

pkg/core/region.go Outdated Show resolved Hide resolved

use general task id

2695c79

Signed-off-by: Ryan Leung <[email protected]>

rleungx requested a review from nolouch June 4, 2024 06:35

nolouch reviewed Jun 4, 2024

View reviewed changes

okJiang reviewed Jun 4, 2024

View reviewed changes

address comments

d73aa2f

Signed-off-by: Ryan Leung <[email protected]>

ti-chi-bot bot added the dco-signoff: yes Indicates the PR's author has signed the dco. label Jun 4, 2024

rleungx requested review from nolouch and okJiang June 4, 2024 08:02

nolouch approved these changes Jun 4, 2024

View reviewed changes

ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 4, 2024

okJiang approved these changes Jun 4, 2024

View reviewed changes

okJiang reviewed Jun 4, 2024

View reviewed changes

rleungx requested a review from JmPotato June 6, 2024 06:30

JmPotato approved these changes Jun 12, 2024

View reviewed changes

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

address the comment

746e7f1

Signed-off-by: Ryan Leung <[email protected]>

rleungx added require-LGT1 Indicates that the PR requires an LGTM. lgtm and removed require-LGT1 Indicates that the PR requires an LGTM. needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jun 13, 2024

Merge branch 'master' into dup

c10679d

ti-chi-bot bot merged commit bf02fb5 into tikv:master Jun 13, 2024
16 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

pkg: remove old duplicated task #8234

pkg: remove old duplicated task #8234

rleungx commented May 31, 2024 •

edited

Loading

ti-chi-bot bot commented May 31, 2024 •

edited

Loading

codecov bot commented May 31, 2024 •

edited

Loading

nolouch Jun 4, 2024

rleungx Jun 4, 2024 •

edited

Loading

nolouch Jun 4, 2024

okJiang Jun 4, 2024

ti-chi-bot bot commented Jun 4, 2024

okJiang Jun 4, 2024

rleungx Jun 5, 2024

JmPotato Jun 12, 2024

ti-chi-bot bot commented Jun 12, 2024

ti-chi-bot bot commented Jun 12, 2024

rleungx commented Jun 13, 2024

ti-chi-bot bot commented Jun 13, 2024

ti-chi-bot bot commented Jun 13, 2024

		@@ -61,16 +61,23 @@ type Task struct {
		var ErrMaxWaitingTasksExceeded = errors.New("max waiting tasks exceeded")

		// ConcurrentRunner is a simple task runner that limits the number of concurrent tasks.

pkg: remove old duplicated task #8234

pkg: remove old duplicated task #8234

Conversation

rleungx commented May 31, 2024 • 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 May 31, 2024 • edited Loading

codecov bot commented May 31, 2024 • edited Loading

Codecov Report

nolouch Jun 4, 2024

Choose a reason for hiding this comment

rleungx Jun 4, 2024 • edited Loading

Choose a reason for hiding this comment

nolouch Jun 4, 2024

Choose a reason for hiding this comment

okJiang Jun 4, 2024

Choose a reason for hiding this comment

ti-chi-bot bot commented Jun 4, 2024

okJiang Jun 4, 2024

Choose a reason for hiding this comment

rleungx Jun 5, 2024

Choose a reason for hiding this comment

JmPotato Jun 12, 2024

Choose a reason for hiding this comment

ti-chi-bot bot commented Jun 12, 2024

ti-chi-bot bot commented Jun 12, 2024

[LGTM Timeline notifier]

rleungx commented Jun 13, 2024

ti-chi-bot bot commented Jun 13, 2024

ti-chi-bot bot commented Jun 13, 2024

rleungx commented May 31, 2024 •

edited

Loading

ti-chi-bot bot commented May 31, 2024 •

edited

Loading

codecov bot commented May 31, 2024 •

edited

Loading

rleungx Jun 4, 2024 •

edited

Loading