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.

Sign up for GitHub

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

Jump to bottom

sink (ticdc): fix a deadlock due to checkpointTs fall back in sinkNode (#4084) #4097

Merged
merged 3 commits into from
Jan 12, 2022
Merged

sink (ticdc): fix a deadlock due to checkpointTs fall back in sinkNode (#4084) #4097

merged 3 commits into from
Jan 12, 2022

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #4084

What problem does this PR solve?

Issue Number: close #4055

What is changed and how it works?

The code changed is simple and the reason is described in comments.

Check List

Tests

  • Unit test

Code changes

Side effects

Related changes

  • Need to cherry-pick to the release branch

Release note 

Fix a bug that can cause changefeed stuck due to a deadlock occurs.

@asddongmen @ti-chi-bot
This is an automated cherry-pick of pingcap#4084
1e96354 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@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 do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. component/sink Sink component. component/sorter Sorter component. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.1 This PR is cherry-picked to release-5.1 from a source PR. labels Dec 28, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 28, 2021
Merged
@ti-chi-bot ti-chi-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 Dec 28, 2021
@overvenus overvenus added this to the v5.1.4 milestone Jan 6, 2022
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 10, 2022
@codecov-commenter
Copy link

Codecov Report

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

@@               Coverage Diff                @@
##             release-5.1      #4097   +/-   ##
================================================
  Coverage               ?   62.0104%           
================================================
  Files                  ?        160           
  Lines                  ?      16802           
  Branches               ?          0           
================================================
  Hits                   ?      10419           
  Misses                 ?       5480           
  Partials               ?        903

@nongfushanquan nongfushanquan added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jan 10, 2022
@asddongmen
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: b0097bc

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 10, 2022
@asddongmen
Copy link
Contributor

/run-unit-tests
/run-integration-tests

@asddongmen
Copy link
Contributor

/run-leak-tests

@ti-chi-bot ti-chi-bot merged commit aee4975 into pingcap:release-5.1 Jan 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@asddongmen asddongmen

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/sink Sink component. component/sorter Sorter component. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 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/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.1 This PR is cherry-picked to release-5.1 from a source PR.
Projects
None yet
Milestone
v5.1.4
Development

Successfully merging this pull request may close these issues.
5 participants
@ti-chi-bot @codecov-commenter @asddongmen @overvenus @nongfushanquan