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

dm: load table structure from dump files #3295

Merged
merged 9 commits into from
Nov 8, 2021
Merged

dm: load table structure from dump files #3295

merged 9 commits into from
Nov 8, 2021

Conversation

lance6716
Copy link
Contributor

@lance6716 lance6716 commented Nov 5, 2021 •
edited
Loading

What problem does this PR solve?

if the task is full+incremental, we can use table structures from dump file to initiate schema tracker. Compared with using downstream table structure, that's better for the scenario when downstream has more columns.

this is done previously but canceled in pingcap/dm#1915 , because at that time with this feature, generating WHERE clause uses upstream PK/UK which will cause data lost. Now we have merged https://github.com/pingcap/ticdc/pull/3168 so this feature can be turned on without correctness problem.

What is changed and how it works?

revert pingcap/dm#1915

Check List

Tests

  • Integration test

Code changes

Side effects

Related changes

  • Need to update the documentation

Release note 

`None`.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 5, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • GMHDBJD
  • lichunzhu

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-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 5, 2021
@lance6716 lance6716 added the area/dm Issues or PRs related to DM. label Nov 5, 2021
GMHDBJD
GMHDBJD approved these changes Nov 5, 2021
View reviewed changes
Copy link
Contributor

@GMHDBJD GMHDBJD left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I forget that whether we have an integration test like create table(id int auto increment, uk int unique) and remove auto increment in downstream. If no, add it in this pr or later downstream PK/UK pr is OK

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 5, 2021
@lance6716
Copy link
Contributor Author

I forget that whether we have an integration test like create table(id int auto increment, uk int unique) and remove auto increment in downstream. If no, add it in this pr or later downstream PK/UK pr is OK

not understand 🤔 do you mean we should check that we're using downstream PK/UK to generate DML? https://github.com/pingcap/ticdc/pull/3168 should cover the test.

and there's a test to ensure original AskTUG issue is fixed.

https://github.com/pingcap/ticdc/blob/df6eefc0833474559ae46ae367fccf59a7a1bb23/dm/tests/all_mode/run.sh#L47

@GMHDBJD
Copy link
Contributor

GMHDBJD commented Nov 5, 2021

Just a suggestion about using a common case to test for both features. Can ignore.

@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 Nov 5, 2021
@lance6716
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 115f0c5

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 6, 2021
@Leavrth
Copy link
Contributor

Leavrth commented Nov 6, 2021

/run-dm-integration-test

@Leavrth
Copy link
Contributor

Leavrth commented Nov 6, 2021

/run-kafka-integration-test

1 similar comment
@Leavrth
Copy link
Contributor

Leavrth commented Nov 6, 2021

/run-kafka-integration-test

@Leavrth Leavrth mentioned this pull request Nov 6, 2021
Merged
@Ehco1996
Copy link
Contributor

Ehco1996 commented Nov 8, 2021

/run-dm-integration-tests

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Nov 8, 2021
@lance6716
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 9066cc9

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

/run-dm-integration-tests

@lance6716
Copy link
Contributor Author

/run-unit-test

@lance6716
Copy link
Contributor Author

/run-dm-integration-tests

@lance6716
Copy link
Contributor Author

/run-integration-tests

@lance6716
Copy link
Contributor Author

/run-kafka-integration-test

@lance6716
Copy link
Contributor Author

/run-integration-tests

@lance6716
Copy link
Contributor Author

/run-dm-integration-tests

@ti-chi-bot
Copy link
Member

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

@ti-chi-bot ti-chi-bot merged commit 794e8e8 into pingcap:master Nov 8, 2021
@yufan022 yufan022 mentioned this pull request Nov 19, 2021
Merged
@lance6716 lance6716 added the needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. label Dec 30, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 30, 2021
Merged
@ti-chi-bot
Copy link
Member

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

ti-chi-bot added a commit that referenced this pull request Dec 30, 2021
@ti-chi-bot
dm: load table structure from dump files (#3295) (#4163)
88f9ec5
3AceShowHand pushed a commit to ti-chi-bot/tiflow that referenced this pull request Jan 13, 2022
@ti-chi-bot @3AceShowHand
dm: load table structure from dump files (pingcap#3295) (pingcap#4163)
76de75d
ti-chi-bot added a commit to ti-chi-bot/tiflow that referenced this pull request Jan 18, 2022
@ti-chi-bot @zhaoxinyu
@amyangfei @lance6716 @sdojjy @3AceShowHand
metrics(cdc): fix mq sink write row count metrics. (pingcap#4192) (pi…
ae04769 
…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 <ti-community-prow-bot@tidb.io>

* 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 <7138436+3AceShowHand@users.noreply.github.com>

* 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 <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>
@lance6716 lance6716 deleted the load-dump-structure branch October 13, 2022 08:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GMHDBJD GMHDBJD GMHDBJD approved these changes

@lichunzhu lichunzhu lichunzhu approved these changes

@okJiang okJiang Awaiting requested review from okJiang

Assignees
No one assigned
Labels
area/dm Issues or PRs related to DM. needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@lance6716 @ti-chi-bot @GMHDBJD @Leavrth @Ehco1996 @lichunzhu