Skip to content

br: fix leak in pdutil.TestScheduler#28932

Merged
ti-chi-bot merged 4 commits intopingcap:masterfrom
unconsolable:issue-28816
Oct 25, 2021
Merged

br: fix leak in pdutil.TestScheduler#28932
ti-chi-bot merged 4 commits intopingcap:masterfrom
unconsolable:issue-28816

Conversation

@unconsolable
Copy link
Contributor

@unconsolable unconsolable commented Oct 19, 2021

Signed-off-by: unconsolable chenzhipeng2012@gmail.com

What problem does this PR solve?

Issue Number: close #28816

Problem Summary:

What is changed and how it works?

What's Changed:

  • Remove a goroutine creation, which will wait on chan schedulerPauseCh
  • Defer close chan schedulerPauseCh

How it Works:

tidb/br/pkg/pdutil/pd_serial_test.go

Lines 70 to 76 in ae346a5

_, err = pdController.pauseSchedulersAndConfigWith(ctx, []string{scheduler}, cfg, mock)
require.NoError(t, err)
go func() {
<-schedulerPauseCh
}()
err = pdController.resumeSchedulerWith(ctx, []string{scheduler}, mock)

IMHO this goroutine creation should be removed, as pauseSchedulersAndConfigWith success, it will create a goroutine and select on it.

tidb/br/pkg/pdutil/pd.go

Lines 448 to 450 in ae346a5

case <-p.schedulerPauseCh:
log.Info("exit pause scheduler and configs successful")
return

Also, in (*PdController).Close(), it will close the chan and the pdClient. As in this scenario pdClient is nill, we can close the channel in defer.

Check List

Tests

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

@unconsolable
br: fix leak in pdutil.TestScheduler
645ef65 
Signed-off-by: unconsolable <chenzhipeng2012@gmail.com>
@ti-chi-bot
Copy link
Member

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • kennytm

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.

Details

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 release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 19, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 20, 2021
@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 Oct 25, 2021
@3pointer
Copy link
Contributor

3pointer commented Oct 25, 2021

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Oct 25, 2021

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

DetailsCommit hash: 645ef65

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

ti-chi-bot commented Oct 25, 2021

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

At the same time I will also trigger all tests for you:

/run-all-tests

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.

Details

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 2ccc8c5 into pingcap:master Oct 25, 2021
@unconsolable unconsolable deleted the issue-28816 branch October 25, 2021 10:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kennytm kennytm kennytm approved these changes

@3pointer 3pointer 3pointer approved these changes

Assignees

No one assigned

Labels

release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Leak test pdutil.TestScheduler

4 participants

@unconsolable @ti-chi-bot @3pointer @kennytm