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

sink: add barrier in underlying sink to support accruate stop #2417

Merged
merged 14 commits into from
Aug 10, 2021

Conversation

amyangfei
Copy link
Contributor

@amyangfei amyangfei commented Jul 29, 2021

What problem does this PR solve?

Fix #2230

This PR introduces a new Barrier API in sink interface, which is a synchronous function to wait all events to be flushed in underlying sink, note once Barrier is called, the resolved ts can't be pushed until the Barrier call returns.

We call Barrier when table sink is closing (via the Close method of table sink), and before Barrier is called, we draw back all existing events in sink buffer.

Note the cherry-pick cannot be merged into release-4.0, release-5.0 until new owner is enabled in these branches.

What is changed and how it works?

  • The Barrier implementation
    • MySQL sink: wait checkpoint-ts to reach max received resolved-ts
    • MQ sink: TODO
  • Drawback mechanism in buffer sink
    • Buffer sink stores rows by table in memory, and emit rows to underlying sink only resolved ts is forwarded.
    • Hook a channel from sink manager to notify buffer sink to draw back rows of a table, and wait callback

Check List

Tests

  • Unit test
  • Integration test

Release note

Fix a bug that multiple processors could write the same table when this table is re-scheduling

@amyangfei amyangfei added type/bugfix This PR fixes a bug. needs-cherry-pick-release-4.0 Should cherry pick this PR to release-4.0 branch. needs-cherry-pick-release-5.0 Should cherry pick this PR to release-5.0 branch. needs-cherry-pick-release-5.1 Should cherry pick this PR to release-5.1 branch. labels Jul 29, 2021
@amyangfei amyangfei added this to the v5.2.0 milestone Jul 29, 2021
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jul 29, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • overvenus

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 the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Jul 29, 2021
@ti-chi-bot ti-chi-bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jul 29, 2021
@amyangfei amyangfei marked this pull request as draft July 29, 2021 09:05
@ti-chi-bot ti-chi-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 29, 2021
@amyangfei
Copy link
Contributor Author

/run-integration-tests

1 similar comment
@amyangfei
Copy link
Contributor Author

/run-integration-tests

@codecov-commenter
Copy link

codecov-commenter commented Jul 30, 2021

Codecov Report

Merging #2417 (b4b6ca5) into master (5a4568b) will decrease coverage by 1.3449%.
The diff coverage is 42.8099%.

@@               Coverage Diff                @@
##             master      #2417        +/-   ##
================================================
- Coverage   57.0620%   55.7170%   -1.3450%     
================================================
  Files           165        168         +3     
  Lines         19435      20570      +1135     
================================================
+ Hits          11090      11461       +371     
- Misses         7288       8006       +718     
- Partials       1057       1103        +46     

@amyangfei
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jul 30, 2021
@amyangfei
Copy link
Contributor Author

/run-integration-tests

@amyangfei
Copy link
Contributor Author

/unhold

@ti-chi-bot
Copy link
Member

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

@amyangfei amyangfei added the require-LGT1 Indicates that the PR requires an LGTM. label Aug 10, 2021
@amyangfei
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: d230dea

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 10, 2021
@amyangfei
Copy link
Contributor Author

/run-kafka-tests

@ti-chi-bot ti-chi-bot merged commit 1800517 into pingcap:master Aug 10, 2021
ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Aug 10, 2021
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #2492.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #2493.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #2494.

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Aug 10, 2021
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #2495.

amyangfei added a commit to ti-chi-bot/tiflow that referenced this pull request Aug 12, 2021
@amyangfei amyangfei deleted the sink-barrier branch August 16, 2021 09:01
@nongfushanquan nongfushanquan added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. needs-cherry-pick-release-4.0 Should cherry pick this PR to release-4.0 branch. needs-cherry-pick-release-5.0 Should cherry pick this PR to release-5.0 branch. needs-cherry-pick-release-5.1 Should cherry pick this PR to release-5.1 branch. needs-cherry-pick-release-5.2 Should cherry pick this PR to release-5.2 branch. release-blocker This issue blocks a release. Please solve it ASAP. release-note Denotes a PR that will be considered when it comes time to generate release notes. require-LGT1 Indicates that the PR requires an LGTM. 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/LGT1 Indicates that a PR has LGTM 1. type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CDC cloud: data inconsistency after CDC owner switching
7 participants