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

compactor: fix duplicate entry in safemode #3432

Merged
merged 14 commits into from
Nov 24, 2021

Conversation

GMHDBJD
Copy link
Contributor

@GMHDBJD GMHDBJD commented Nov 12, 2021

What problem does this PR solve?

in pingcap/dm#2061, we change replace to insert on duplicate key update
but insert on duplicate key update will error when there is more than one key duplicate.
.e.g.

downstream: (1,1),(2,3)
insert (1,3) on duplicate key update will report duplicate key error
replace(1,3) will delete both rows and insert it

What is changed and how it works?

  • use replace instead in safemode
    • insert(safemode) => replace
    • insert => insert
    • update(safemode) => delete + replace
    • update(update pk) => update
    • update(not update pk) => insert on duplicate key update
    • delete => delete

Check List

Tests

  • Unit test
  • Integration test

Release note

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 12, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Ehco1996
  • lance6716

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/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note-none Denotes a PR that doesn't merit a release note. 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 Nov 12, 2021
@GMHDBJD GMHDBJD added status/ptal Could you please take a look? needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. labels Nov 12, 2021
@lance6716
Copy link
Contributor

/run-dm-integration-test

@GMHDBJD
Copy link
Contributor Author

GMHDBJD commented Nov 12, 2021

/run-dm-integration-test

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 15, 2021
@Ehco1996 Ehco1996 added the area/dm Issues or PRs related to DM. label Nov 16, 2021
Copy link
Contributor

@Ehco1996 Ehco1996 left a comment

Choose a reason for hiding this comment

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

LGTM

@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 16, 2021
@GMHDBJD
Copy link
Contributor Author

GMHDBJD commented Nov 16, 2021

/run-dm-integration-test

@Ehco1996
Copy link
Contributor

/run-dm-integration-tests
/run-dm-compatibility-test
/run-integration-test
/run-kafka-integration-test

@GMHDBJD
Copy link
Contributor Author

GMHDBJD commented Nov 22, 2021

/run-dm-integration-tests
/run-dm-compatibility-test
/run-integration-test
/run-kafka-integration-test

@GMHDBJD
Copy link
Contributor Author

GMHDBJD commented Nov 22, 2021

/run-dm-integration-tests
/run-dm-compatibility-test
/run-integration-test
/run-kafka-integration-test

@GMHDBJD
Copy link
Contributor Author

GMHDBJD commented Nov 23, 2021

/run-all-tests

@codecov-commenter
Copy link

Codecov Report

Merging #3432 (71a4ea8) into master (24030f8) will increase coverage by 1.4432%.
The diff coverage is 69.0486%.

@@               Coverage Diff                @@
##             master      #3432        +/-   ##
================================================
+ Coverage   56.5356%   57.9789%   +1.4432%     
================================================
  Files           211        240        +29     
  Lines         22798      24452      +1654     
================================================
+ Hits          12889      14177      +1288     
- Misses         8598       8856       +258     
- Partials       1311       1419       +108     

@GMHDBJD
Copy link
Contributor Author

GMHDBJD commented Nov 24, 2021

/run-all-tests

@lance6716
Copy link
Contributor

/hold

to avoid /merge trigger run-all-tests

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 24, 2021
@lance6716
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 5a04a27

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

/unhold

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 24, 2021
@GMHDBJD
Copy link
Contributor Author

GMHDBJD commented Nov 24, 2021

/run-integration-test
/run-kafka-integration-test

@ti-chi-bot ti-chi-bot merged commit 76e701d into pingcap:master Nov 24, 2021
ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Nov 24, 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: #3602.

okJiang pushed a commit to okJiang/tiflow that referenced this pull request Dec 8, 2021
@GMHDBJD
Copy link
Contributor Author

GMHDBJD commented Dec 27, 2021

/cherry-pick release-5.3

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

@GMHDBJD: new pull request created: #4088.

In response to this:

/cherry-pick release-5.3

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.

3AceShowHand pushed a commit to ti-chi-bot/tiflow that referenced this pull request Jan 13, 2022
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 <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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/L Denotes a PR that changes 100-499 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. status/ptal Could you please take a look?
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants