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

worker(dm): fix Server Start/Close race (#6213) #6292

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #6213

Signed-off-by: lance6716 lance6716@gmail.com

What problem does this PR solve?

Issue Number: close #5836 close #5089

What is changed and how it works?

for #5836 : Server.Start is blocking, so before it we must spawn a goroutine to watch terminate signal. Original in that goroutine we call Server.Close, but Start/Close is not concurrent-safe. Now we use context to do cancellation.

for #5089 : when worker Server is about to close, it will hold the lock, enter doClose, then blocked on waitgroup

s.cancel()
s.wg.Wait()

but other goroutine may in the same time stuck at s.Lock.

Check List

Tests

  • hard to test these functions 🤔

Questions

Will it cause performance regression or break compatibility?
Do you need to update user documentation, design documentation or monitoring documentation?

Release note

Fix a bug that start DM-worker and `kill` it immediately will not let process stop.

lance6716 and others added 13 commits July 15, 2022 03:27
Signed-off-by: lance6716 <lance6716@gmail.com>
Signed-off-by: lance6716 <lance6716@gmail.com>
This reverts commit 0a7a73c.
Signed-off-by: lance6716 <lance6716@gmail.com>
Signed-off-by: lance6716 <lance6716@gmail.com>
Signed-off-by: lance6716 <lance6716@gmail.com>
Signed-off-by: lance6716 <lance6716@gmail.com>
Signed-off-by: lance6716 <lance6716@gmail.com>
Signed-off-by: lance6716 <lance6716@gmail.com>
Co-authored-by: D3Hunter <jujj603@gmail.com>
@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has not been approved.

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 added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR. labels Jul 15, 2022
@codecov-commenter
Copy link

codecov-commenter commented Jul 15, 2022

Codecov Report

❗ No coverage uploaded for pull request base (release-6.1@8e289e4). Click here to learn what that means.
The diff coverage is n/a.

Flag Coverage Δ
cdc 62.2852% <0.0000%> (?)
dm 52.0170% <0.0000%> (?)

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

@@               Coverage Diff                @@
##             release-6.1      #6292   +/-   ##
================================================
  Coverage               ?   56.5524%           
================================================
  Files                  ?        532           
  Lines                  ?      70241           
  Branches               ?          0           
================================================
  Hits                   ?      39723           
  Misses                 ?      26744           
  Partials               ?       3774           

@lance6716
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: ff8a4f2

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 15, 2022
@lance6716 lance6716 added the area/dm Issues or PRs related to DM. label Jul 15, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jul 15, 2022
@ti-chi-bot ti-chi-bot merged commit 60335af into pingcap:release-6.1 Jul 15, 2022
@jayl1e jayl1e added this to the v6.1.1 milestone Aug 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/dm Issues or PRs related to DM. cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 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. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants