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.

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

*: fix context usage when watch etcd #7806

Merged
merged 3 commits into from
Feb 5, 2024
Merged

Conversation

rleungx
Copy link
Member

@rleungx rleungx commented Feb 5, 2024

What problem does this PR solve?

Issue Number: Close #7807

What is changed and how does it work?

Check List

Tests

  • Manual test

Use playground to start 3 TiDB, and kill one by one, the watch goroutines are reduced.

Release note

None.

Copy link
Contributor

ti-chi-bot bot commented Feb 5, 2024

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CabinfeverB
  • HuSharp

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.

@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. labels Feb 5, 2024
@ti-chi-bot ti-chi-bot bot requested review from nolouch and Yisaer February 5, 2024 07:38
@ti-chi-bot ti-chi-bot bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 5, 2024
@@ -86,7 +86,7 @@ func (s *Service) Watch(req *meta_storagepb.WatchRequest, server meta_storagepb.
if err := s.checkServing(); err != nil {
return err
}
ctx, cancel := context.WithCancel(s.ctx)
ctx, cancel := context.WithCancel(server.Context())
Copy link
Member

Choose a reason for hiding this comment

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

Please also modify WatchGlobalConfig

Copy link

codecov bot commented Feb 5, 2024

Codecov Report

Merging #7806 (f6aa9bc) into master (12d75c7) will decrease coverage by 0.13%.
The diff coverage is 33.33%.

❗ Current head f6aa9bc differs from pull request most recent head d19d4a5. Consider uploading reports for the commit d19d4a5 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7806      +/-   ##
==========================================
- Coverage   73.50%   73.37%   -0.13%     
==========================================
  Files         432      432              
  Lines       47838    47842       +4     
==========================================
- Hits        35163    35104      -59     
- Misses       9636     9692      +56     
- Partials     3039     3046       +7     
Flag Coverage Δ
unittests 73.37% <33.33%> (-0.13%) ⬇️

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

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 5, 2024
@ti-chi-bot 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 Feb 5, 2024
Signed-off-by: Ryan Leung <[email protected]>
@ti-chi-bot ti-chi-bot bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 5, 2024
@rleungx
Copy link
Member Author

rleungx commented Feb 5, 2024

/merge

Copy link
Contributor

ti-chi-bot bot commented Feb 5, 2024

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

Copy link
Contributor

ti-chi-bot bot commented Feb 5, 2024

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

Commit hash: f6aa9bc

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 5, 2024
Copy link
Contributor

ti-chi-bot bot commented Feb 5, 2024

@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 ti-chi-bot bot merged commit 37be34e into tikv:master Feb 5, 2024
22 checks passed
@ti-chi-bot ti-chi-bot added the needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. label Feb 6, 2024
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Feb 6, 2024
@rleungx rleungx deleted the fix-context branch February 6, 2024 08:25
@rleungx rleungx added the needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. label Feb 6, 2024
ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Feb 6, 2024
@ti-chi-bot
Copy link
Member

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

ti-chi-bot bot pushed a commit that referenced this pull request Feb 7, 2024
close #7807

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

Co-authored-by: Ryan Leung <[email protected]>
ti-chi-bot bot added a commit that referenced this pull request Feb 21, 2024
close #7807

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

Co-authored-by: Ryan Leung <[email protected]>
Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 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
Development

Successfully merging this pull request may close these issues.

Memory leak caused by watch
4 participants