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(ticdc): cherry pick sink bug fix to release 5.3 #4083

Merged

Conversation

sdojjy
Copy link
Member

@sdojjy sdojjy commented Dec 27, 2021

What problem does this PR solve?

Cherrypick #3613 #3621 #3625 #3638 #3645 #3746

cc #3545

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Code changes

  • Has exported function/method change
  • Has exported variable/fields change
  • Has interface methods change
  • Has persistent data change

Side effects

  • Possible performance regression
  • Increased code complexity
  • Breaking backward compatibility

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation
  • Need to update key monitor metrics in both TiCDC document and official document

Release note

Manage sink checkpoint per table to avoid checkpointTs advances unexpected.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 27, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • asddongmen
  • 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 do-not-merge/needs-linked-issue release-note Denotes a PR that will be considered when it comes time to generate release notes. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 27, 2021
@sdojjy sdojjy changed the base branch from master to release-5.3 December 27, 2021 02:51
@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 27, 2021
@sdojjy sdojjy changed the title Cherry pick sink bug fix to release 5.3 sin(ticdc): Cherry pick sink bug fix to release 5.3 Dec 27, 2021
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 27, 2021
@sdojjy
Copy link
Member Author

sdojjy commented Dec 27, 2021

/run-integration-tests

@sdojjy
Copy link
Member Author

sdojjy commented Dec 27, 2021

/run-kafka-integration-test

@sdojjy
Copy link
Member Author

sdojjy commented Dec 27, 2021

/run-all-tests

@sdojjy sdojjy closed this Dec 27, 2021
@sdojjy sdojjy force-pushed the cherry-pick-sink-bug-fix-to-release-5.3 branch from 640ebbf to 1eca2a5 Compare December 27, 2021 06:50
@ti-chi-bot ti-chi-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 27, 2021
# Conflicts:
#	cdc/sink/sink.go
#	cdc/sink/table_sink.go
@sdojjy sdojjy reopened this Dec 27, 2021
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 27, 2021
@sdojjy sdojjy changed the title sin(ticdc): Cherry pick sink bug fix to release 5.3 sin(ticdc): cherry pick sink bug fix to release 5.3 Dec 27, 2021
@sdojjy
Copy link
Member Author

sdojjy commented Dec 28, 2021

/run-kafka-integration-test

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 28, 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 Dec 28, 2021
@asddongmen
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 8e34358

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 28, 2021
@Rustin170506 Rustin170506 added needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. type/cherry-pick-for-release-5.3 This PR is cherry-picked to release-5.3 from a source PR. and removed needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. labels Dec 28, 2021
@asddongmen
Copy link
Contributor

/run-leak-tests
/run-dm-integration-tests

@ti-chi-bot ti-chi-bot merged commit b394044 into pingcap:release-5.3 Dec 28, 2021
@sdojjy sdojjy deleted the cherry-pick-sink-bug-fix-to-release-5.3 branch December 29, 2021 03:17
@sdojjy sdojjy added the needs-cherry-pick-release-5.2 Should cherry pick this PR to release-5.2 branch. label Dec 29, 2021
ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Dec 29, 2021
@ti-chi-bot
Copy link
Member

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

3AceShowHand pushed a commit to ti-chi-bot/tiflow that referenced this pull request Jan 13, 2022
overvenus pushed a commit that referenced this pull request Jan 18, 2022
* fix the txn_batch_size metric inaccuracy bug when the sink target is MQ

* address comments

* add comments for exported functions

* fix the compiling problem

* workerpool: limit the rate to output deadlock warning (#3775) (#3799)

* metrics: add changefeed checkepoint catch-up ETA (#3300) (#3311)

* pkg,cdc: do not use log package (#3902) (#3939)

* *: rename repo from pingcap/ticdc to pingcap/tiflow (#3957)

* kvclient(ticdc): fix kvclient takes too long time to recover (#3612) (#3662)

* tz (ticdc): fix timezone error (#3887) (#3910)

* http_*: add log for http api and refine the err handle logic (#2997) (#3306)

* ticdc/alert: add no owner alert rule (#3809) (#3831)

* etcd_worker: batch etcd patch (#3277) (#3393)

* ticdc/owner: Fix ddl special comment syntax error (#3845) (#3977)

* Clean old owner and old processor in release 5.2 branch (#4019)

* tests(ticdc): set up the sync diff output directory correctly (#3725) (#3745)

* owner,scheduler(cdc): fix nil pointer panic in owner scheduler (#2980) (#4007) (#4015)

* config(ticdc): Fix old value configuration check for maxwell protocol (#3747) (#3782)

* ticdc/processor: Fix backoff base delay misconfiguration (#3992) (#4027)

* sink(ticdc): cherry pick sink bug fix to release 5.2 (#4083) (#4119)

* metrics(ticdc): add resolved ts and add changefeed to dataflow (#4038) (#4103)

* kv(ticdc): reduce eventfeed rate limited log (#4072) (#4110)

close #4006

* This is an automated cherry-pick of #4192

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

* http_api (ticdc): fix http api 'get processor' panic. (#4117) (#4122)

close #3840

* cdc/sink: adjust kafka initialization logic (#3192) (#3568)

* This is an automated cherry-pick of #3192

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

* fix conflicts.

* This is an automated cherry-pick of #3682

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

* fix import.

* fix failpoint path.

* try to fix initialize.

* remove table_sink.

* remove initialization.

* remove owner.

* fix mq.

Co-authored-by: Ling Jin <[email protected]>
Co-authored-by: 3AceShowHand <[email protected]>

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

close #4055

* This is an automated cherry-pick of #4192

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

* fix conflicts.

* fix conflicts.

* fix conflicts.

Co-authored-by: zhaoxinyu <[email protected]>
Co-authored-by: amyangfei <[email protected]>
Co-authored-by: dongmen <[email protected]>
Co-authored-by: Ling Jin <[email protected]>
Co-authored-by: 3AceShowHand <[email protected]>
ti-chi-bot added a commit to ti-chi-bot/tiflow that referenced this pull request Jan 18, 2022
…ngcap#4323)

* fix the txn_batch_size metric inaccuracy bug when the sink target is MQ

* address comments

* add comments for exported functions

* fix the compiling problem

* workerpool: limit the rate to output deadlock warning (pingcap#3775) (pingcap#3795)

* tests(ticdc): set up the sync diff output directory correctly (pingcap#3725) (pingcap#3741)

* relay(dm): use binlog name comparison (pingcap#3710) (pingcap#3712)

* dm/load: fix concurrent call Loader.Status (pingcap#3459) (pingcap#3468)

* cdc/sorter: make unified sorter cgroup aware (pingcap#3436) (pingcap#3439)

* tz (ticdc): fix timezone error (pingcap#3887) (pingcap#3906)

* pkg,cdc: do not use log package (pingcap#3902) (pingcap#3940)

* *: rename repo from pingcap/ticdc to pingcap/tiflow (pingcap#3959)

* http_*: add log for http api and refine the err handle logic (pingcap#2997) (pingcap#3307)

* etcd_worker: batch etcd patch (pingcap#3277) (pingcap#3389)

* http_api (ticdc): check --cert-allowed-cn before add server common name (pingcap#3628) (pingcap#3882)

* kvclient(ticdc): fix kvclient takes too long time to recover (pingcap#3612) (pingcap#3663)

* owner: fix owner tick block http request (pingcap#3490) (pingcap#3530)

* dm/syncer: use downstream PK/UK to generate DML (pingcap#3168) (pingcap#3256)

* dep(dm): update go-mysql (pingcap#3914) (pingcap#3934)

* dm/syncer: multiple rows use downstream schema (pingcap#3308) (pingcap#3953)

* errorutil,sink,syncer: add errorutil to handle ignorable error (pingcap#3264) (pingcap#3995)

* dm/worker: don't exit when failed to read checkpoint in relay (pingcap#3345) (pingcap#4005)

* syncer(dm): use an early location to reset binlog and open safemode (pingcap#3860)

* ticdc/owner: Fix ddl special comment syntax error (pingcap#3845) (pingcap#3978)

* dm/scheduler: fix inconsistent of relay status (pingcap#3474) (pingcap#4009)

* owner,scheduler(cdc): fix nil pointer panic in owner scheduler (pingcap#2980) (pingcap#4007) (pingcap#4016)

* config(ticdc): Fix old value configuration check for maxwell protocol (pingcap#3747) (pingcap#3783)

* sink(ticdc): cherry pick sink bug fix to release 5.3 (pingcap#4083)

* master(dm): clean and treat invalid load task (pingcap#4004) (pingcap#4145)

* loader: fix wrong progress in query-status for loader (pingcap#4093) (pingcap#4143)

close pingcap#3252

* ticdc/processor: Fix backoff base delay misconfiguration (pingcap#3992) (pingcap#4028)

* dm: load table structure from dump files (pingcap#3295) (pingcap#4163)

* compactor: fix duplicate entry in safemode (pingcap#3432) (pingcap#3434) (pingcap#4088)

* kv(ticdc): reduce eventfeed rate limited log (pingcap#4072) (pingcap#4111)

close pingcap#4006

* metrics(ticdc): add resolved ts and add changefeed to dataflow (pingcap#4038) (pingcap#4104)

* This is an automated cherry-pick of pingcap#4192

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

* retry(dm): align with tidb latest error message (pingcap#4172) (pingcap#4254)

close pingcap#4159, close pingcap#4246

* owner(ticdc): Add bootstrap and try to fix the meta information in it (pingcap#3838) (pingcap#3865)

* redolog: add a precleanup process when s3 enable (pingcap#3525) (pingcap#3878)

* ddl(dm): make skipped ddl pass `SplitDDL()` (pingcap#4176) (pingcap#4227)

close pingcap#4173

* cdc/sink: remove Initialize method from the sink interface (pingcap#3682) (pingcap#3765)

Co-authored-by: Ling Jin <[email protected]>

* http_api (ticdc): fix http api 'get processor' panic. (pingcap#4117) (pingcap#4123)

close pingcap#3840

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

close pingcap#4055

* cdc/sink: adjust kafka initialization logic (pingcap#3192) (pingcap#4162)

* try fix conflicts.

* This is an automated cherry-pick of pingcap#4192

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

* fix conflicts.

* fix conflicts.

Co-authored-by: zhaoxinyu <[email protected]>
Co-authored-by: amyangfei <[email protected]>
Co-authored-by: lance6716 <[email protected]>
Co-authored-by: sdojjy <[email protected]>
Co-authored-by: Ling Jin <[email protected]>
Co-authored-by: 3AceShowHand <[email protected]>
@purelind purelind added this to the v5.3.1 milestone Feb 24, 2022
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. do-not-merge/needs-linked-issue needs-cherry-pick-release-5.2 Should cherry pick this PR to release-5.2 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ 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-5.3 This PR is cherry-picked to release-5.3 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants