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

ti-chi-bot · 2021-11-03T09:59:44Z

This is an automated cherry-pick of #3168

What problem does this PR solve?

it is about pingcap/dm#1895

What is changed and how it works?

it will use pk/uk in downstream schema to generate where condititons in DML.

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

Please add a release note.
If you don't think this PR needs a release note then fill it with `None`.

dm syncer use downstream pk/uk info which is tracked in schema tracker to generate DML sql, it will avoid error behavior in downstream DML caused by upstream data duplication like pingcap/dm#1895.

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

ti-chi-bot · 2021-11-03T09:59:45Z

[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.

glorv · 2021-11-04T01:07:43Z

@WizardXiao Please resolve the conflicts

WizardXiao · 2021-11-04T07:26:21Z

/run-dm-integration-test

WizardXiao · 2021-11-04T09:09:47Z

/run-dm-compatibility-test

WizardXiao · 2021-11-04T09:25:02Z

/run-kafka-integration-test

WizardXiao · 2021-11-04T10:50:31Z

/run-integration-test

codecov-commenter · 2021-11-04T11:12:45Z

Codecov Report

Merging #3256 (cab561d) into release-5.3 (6c6ca9e) will decrease coverage by 0.0394%.
The diff coverage is n/a.

@@                 Coverage Diff                 @@
##           release-5.3      #3256        +/-   ##
===================================================
- Coverage      56.7517%   56.7122%   -0.0395%     
===================================================
  Files              211        211                
  Lines            22794      22794                
===================================================
- Hits             12936      12927         -9     
- Misses            8529       8535         +6     
- Partials          1329       1332         +3

lance6716 · 2021-12-17T09:46:14Z

@WizardXiao please resolve conflicts. error code should keep same with master

WizardXiao · 2021-12-17T13:19:40Z

@WizardXiao please resolve conflicts. error code should keep same with master

ok

WizardXiao · 2021-12-17T14:06:40Z

/run-all-tests

WizardXiao · 2021-12-17T14:42:45Z

/run-all-tests

WizardXiao · 2021-12-17T15:04:05Z

/run-kafka-integration-test

lance6716 · 2021-12-20T02:13:42Z

dm/_utils/terror_gen/errors_release.txt

@@ -495,6 +495,10 @@ ErrSchemaTrackerInvalidCreateTableStmt,[code=44009:class=schema-tracker:scope=in
 ErrSchemaTrackerRestoreStmtFail,[code=44010:class=schema-tracker:scope=internal:level=medium], "Message: fail to restore the statement"
 ErrSchemaTrackerCannotDropTable,[code=44011:class=schema-tracker:scope=internal:level=high], "Message: failed to drop table for %v in schema tracker"
 ErrSchemaTrackerInit,[code=44012:class=schema-tracker:scope=internal:level=high], "Message: failed to create schema tracker"
+ErrSchemaTrackerCannotSetDownstreamSQLMode,[code=44013:class=schema-tracker:scope=internal:level=high], "Message: failed to set default downstream sql_mode %v in schema tracker"


the error code is not same with master, checking

@WizardXiao please resolve conflicts. error code should keep same with master

https://github.com/pingcap/tiflow/pull/3171/files we should keep error code 44013 as ErrSchemaTrackerMarshalJSON. BTW @Ehco1996 why the codes are not sorted?

ok, previous commit just fix error_list.go and error.toml, i will fix errors_release.txt.

WizardXiao · 2021-12-20T03:56:33Z

/run-all-tests

WizardXiao · 2021-12-20T06:28:25Z

/run-dm-integration-test

WizardXiao · 2021-12-20T07:28:42Z

/run-all-tests

WizardXiao · 2021-12-20T08:51:39Z

/run-leak-test

lance6716 · 2021-12-21T02:09:47Z

lgtm

/assign @nongfushanquan

lance6716 · 2021-12-21T02:53:13Z

/merge

ti-chi-bot · 2021-12-21T02:53:16Z

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

Commit hash: 704f88d

ti-chi-bot · 2021-12-21T02:53:29Z

@ti-chi-bot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

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.

WizardXiao · 2021-12-21T03:31:16Z

/run-dm-integration-test

WizardXiao · 2021-12-21T03:31:29Z

/run-leak-test

lance6716 · 2021-12-21T04:15:49Z

/run-leak-test

…ap#3256)

* 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) (#3795) * tests(ticdc): set up the sync diff output directory correctly (#3725) (#3741) * relay(dm): use binlog name comparison (#3710) (#3712) * dm/load: fix concurrent call Loader.Status (#3459) (#3468) * cdc/sorter: make unified sorter cgroup aware (#3436) (#3439) * tz (ticdc): fix timezone error (#3887) (#3906) * pkg,cdc: do not use log package (#3902) (#3940) * *: rename repo from pingcap/ticdc to pingcap/tiflow (#3959) * http_*: add log for http api and refine the err handle logic (#2997) (#3307) * etcd_worker: batch etcd patch (#3277) (#3389) * http_api (ticdc): check --cert-allowed-cn before add server common name (#3628) (#3882) * kvclient(ticdc): fix kvclient takes too long time to recover (#3612) (#3663) * owner: fix owner tick block http request (#3490) (#3530) * dm/syncer: use downstream PK/UK to generate DML (#3168) (#3256) * dep(dm): update go-mysql (#3914) (#3934) * dm/syncer: multiple rows use downstream schema (#3308) (#3953) * errorutil,sink,syncer: add errorutil to handle ignorable error (#3264) (#3995) * dm/worker: don't exit when failed to read checkpoint in relay (#3345) (#4005) * syncer(dm): use an early location to reset binlog and open safemode (#3860) * ticdc/owner: Fix ddl special comment syntax error (#3845) (#3978) * dm/scheduler: fix inconsistent of relay status (#3474) (#4009) * owner,scheduler(cdc): fix nil pointer panic in owner scheduler (#2980) (#4007) (#4016) * config(ticdc): Fix old value configuration check for maxwell protocol (#3747) (#3783) * sink(ticdc): cherry pick sink bug fix to release 5.3 (#4083) * master(dm): clean and treat invalid load task (#4004) (#4145) * loader: fix wrong progress in query-status for loader (#4093) (#4143) close #3252 * ticdc/processor: Fix backoff base delay misconfiguration (#3992) (#4028) * dm: load table structure from dump files (#3295) (#4163) * compactor: fix duplicate entry in safemode (#3432) (#3434) (#4088) * kv(ticdc): reduce eventfeed rate limited log (#4072) (#4111) close #4006 * metrics(ticdc): add resolved ts and add changefeed to dataflow (#4038) (#4104) * This is an automated cherry-pick of #4192 Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io> * retry(dm): align with tidb latest error message (#4172) (#4254) close #4159, close #4246 * owner(ticdc): Add bootstrap and try to fix the meta information in it (#3838) (#3865) * redolog: add a precleanup process when s3 enable (#3525) (#3878) * ddl(dm): make skipped ddl pass `SplitDDL()` (#4176) (#4227) close #4173 * cdc/sink: remove Initialize method from the sink interface (#3682) (#3765) Co-authored-by: Ling Jin <7138436+3AceShowHand@users.noreply.github.com> * http_api (ticdc): fix http api 'get processor' panic. (#4117) (#4123) close #3840 * sink (ticdc): fix a deadlock due to checkpointTs fall back in sinkNode (#4084) (#4099) close #4055 * cdc/sink: adjust kafka initialization logic (#3192) (#4162) * try fix conflicts. * This is an automated cherry-pick of #4192 Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io> * fix conflicts. * fix conflicts. Co-authored-by: zhaoxinyu <zhaoxinyu512@gmail.com> Co-authored-by: amyangfei <yangfei@pingcap.com> Co-authored-by: lance6716 <lance6716@gmail.com> Co-authored-by: sdojjy <sdojjy@qq.com> Co-authored-by: Ling Jin <7138436+3AceShowHand@users.noreply.github.com> Co-authored-by: 3AceShowHand <jinl1037@hotmail.com>

This is an automated cherry-pick of pingcap#3168

8128f38

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

ti-chi-bot mentioned this pull request Nov 3, 2021

dm/syncer: use downstream PK/UK to generate DML #3168

Merged

ti-chi-bot added 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. labels Nov 3, 2021

commit-message: merge conflict

cab561d

ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 8, 2021

lance6716 mentioned this pull request Dec 17, 2021

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

Closed

commit-message: fix conflict

f57b50f

ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 17, 2021

commit-message: fix compile error

5751cf1

lance6716 reviewed Dec 20, 2021

View reviewed changes

commit-message: fix error code in release

2597e7e

commit-message: fix error code order

9a50336

ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 20, 2021

commit-message: fix import tiflow conflict

c4d1ce8

ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 20, 2021

commit-message: fix integration test and make check

704f88d

ti-chi-bot assigned nongfushanquan Dec 21, 2021

nongfushanquan added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Dec 21, 2021

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 21, 2021

Merge branch 'release-5.3' into cherry-pick-3168-to-release-5.3

e8e518a

ti-chi-bot merged commit d277b64 into pingcap:release-5.3 Dec 21, 2021

3AceShowHand pushed a commit to ti-chi-bot/tiflow that referenced this pull request Jan 13, 2022

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

9f32dd5

…ap#3256)

purelind added this to the v5.3.1 milestone Feb 24, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

ti-chi-bot commented Nov 3, 2021

ti-chi-bot commented Nov 3, 2021

glorv commented Nov 4, 2021

WizardXiao commented Nov 4, 2021

WizardXiao commented Nov 4, 2021

WizardXiao commented Nov 4, 2021

WizardXiao commented Nov 4, 2021

codecov-commenter commented Nov 4, 2021

lance6716 commented Dec 17, 2021

WizardXiao commented Dec 17, 2021

WizardXiao commented Dec 17, 2021

WizardXiao commented Dec 17, 2021

WizardXiao commented Dec 17, 2021

lance6716 Dec 20, 2021 •

edited

Loading

lance6716 Dec 20, 2021

WizardXiao Dec 20, 2021 •

edited

Loading

WizardXiao commented Dec 20, 2021

WizardXiao commented Dec 20, 2021

WizardXiao commented Dec 20, 2021

WizardXiao commented Dec 20, 2021

lance6716 commented Dec 21, 2021

lance6716 commented Dec 21, 2021

ti-chi-bot commented Dec 21, 2021

ti-chi-bot commented Dec 21, 2021

WizardXiao commented Dec 21, 2021

WizardXiao commented Dec 21, 2021

lance6716 commented Dec 21, 2021

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

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

Conversation

ti-chi-bot commented Nov 3, 2021

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

ti-chi-bot commented Nov 3, 2021

glorv commented Nov 4, 2021

WizardXiao commented Nov 4, 2021

WizardXiao commented Nov 4, 2021

WizardXiao commented Nov 4, 2021

WizardXiao commented Nov 4, 2021

codecov-commenter commented Nov 4, 2021

Codecov Report

lance6716 commented Dec 17, 2021

WizardXiao commented Dec 17, 2021

WizardXiao commented Dec 17, 2021

WizardXiao commented Dec 17, 2021

WizardXiao commented Dec 17, 2021

lance6716 Dec 20, 2021 • edited Loading

Choose a reason for hiding this comment

lance6716 Dec 20, 2021

Choose a reason for hiding this comment

WizardXiao Dec 20, 2021 • edited Loading

Choose a reason for hiding this comment

WizardXiao commented Dec 20, 2021

WizardXiao commented Dec 20, 2021

WizardXiao commented Dec 20, 2021

WizardXiao commented Dec 20, 2021

lance6716 commented Dec 21, 2021

lance6716 commented Dec 21, 2021

ti-chi-bot commented Dec 21, 2021

ti-chi-bot commented Dec 21, 2021

WizardXiao commented Dec 21, 2021

WizardXiao commented Dec 21, 2021

lance6716 commented Dec 21, 2021

lance6716 Dec 20, 2021 •

edited

Loading

WizardXiao Dec 20, 2021 •

edited

Loading