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

(redo)ticdc: fix the event orderliness in redo log #11117

Merged
merged 6 commits into from
May 17, 2024

Conversation

hongyunyan
Copy link
Collaborator

@hongyunyan hongyunyan commented May 16, 2024

What problem does this PR solve?

Issue Number: close #11096

What is changed and how it works?

  1. Fix the less function of logHeap to make dml event of redo log in the same txn sorted as delete/update/insert.
  2. use startTs instead of commitTs in redo apply to distinguish different txns.

Check List

Tests

  • Unit test

  • Manual test (add detailed scripts or steps below)

    create mysql sink changefeed with redo log on
    run gotpc workload
    After 30m, pause changefeed and run redo apply

Questions

Will it cause performance regression or break compatibility?
Do you need to update user documentation, design documentation or monitoring documentation?

Release note

None

@ti-chi-bot ti-chi-bot 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 May 16, 2024
@ti-chi-bot ti-chi-bot bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 16, 2024
Copy link

codecov bot commented May 16, 2024

Codecov Report

Attention: Patch coverage is 95.23810% with 1 lines in your changes are missing coverage. Please review.

Project coverage is 57.6426%. Comparing base (aed7768) to head (2d51f8e).
Report is 3 commits behind head on master.

Additional details and impacted files
Components Coverage Δ
cdc 62.1232% <95.2381%> (+0.1692%) ⬆️
dm 51.2358% <ø> (-0.0092%) ⬇️
engine 63.4161% <ø> (+0.0070%) ⬆️
Flag Coverage Δ
unit 57.6426% <95.2381%> (+0.0959%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@@               Coverage Diff                @@
##             master     #11117        +/-   ##
================================================
+ Coverage   57.5466%   57.6426%   +0.0959%     
================================================
  Files           853        854         +1     
  Lines        125679     126266       +587     
================================================
+ Hits          72324      72783       +459     
- Misses        47986      48102       +116     
- Partials       5369       5381        +12     

@ti-chi-bot ti-chi-bot bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels May 16, 2024
Copy link
Collaborator

@lidezhu lidezhu left a comment

Choose a reason for hiding this comment

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

LGTM

h[i].data.RedoRow.Row.StartTs < h[j].data.RedoRow.Row.StartTs {
return true
if h[i].data.RedoRow.Row.CommitTs == h[j].data.RedoRow.Row.CommitTs {
if h[i].data.RedoRow.Row.StartTs < h[j].data.RedoRow.Row.StartTs {
Copy link
Contributor

Choose a reason for hiding this comment

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

remove useless else branch:

Suggested change
if h[i].data.RedoRow.Row.StartTs < h[j].data.RedoRow.Row.StartTs {
if h[i].data.RedoRow.Row.StartTs != h[j].data.RedoRow.Row.StartTs {
return h[i].data.RedoRow.Row.StartTs < h[j].data.RedoRow.Row.StartTs
}
...

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Good Point!

Copy link
Contributor

ti-chi-bot bot commented May 16, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CharlesCheung96, lidezhu

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [CharlesCheung96,lidezhu]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link
Contributor

ti-chi-bot bot commented May 16, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-05-16 08:55:35.498848527 +0000 UTC m=+1729889.255984101: ☑️ agreed by lidezhu.
  • 2024-05-16 13:11:22.424236664 +0000 UTC m=+1745236.181372265: ☑️ agreed by CharlesCheung96.

@CharlesCheung96
Copy link
Contributor

/retest

1 similar comment
@hongyunyan
Copy link
Collaborator Author

/retest

@hongyunyan
Copy link
Collaborator Author

/retest

1 similar comment
@hongyunyan
Copy link
Collaborator Author

/retest

@hongyunyan
Copy link
Collaborator Author

/cherry-pick release-8.1

@ti-chi-bot
Copy link
Member

@hongyunyan: once the present PR merges, I will cherry-pick it on top of release-8.1 in the new PR and assign it to you.

In response to this:

/cherry-pick release-8.1

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.

@hongyunyan
Copy link
Collaborator Author

/test cdc-integration-kafka-test

return h[i].data.RedoRow.Row.StartTs < h[j].data.RedoRow.Row.StartTs
}
// in the same txn, we need to sort by delete/update/insert order
if h[i].data.RedoRow.Row.ToRowChangedEvent().IsDelete() {
Copy link
Contributor

Choose a reason for hiding this comment

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

ToRowChangedEvent should only be called once, if it may cost some resource.

else is redundant I think.

expect bool
}{
{
name: "Delete before Update",
Copy link
Contributor

Choose a reason for hiding this comment

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

These data is hard to read, use schema test helper to new events is preferred.

I would suggest that test for each case independently, instead of create a tests and loop over each.

@ti-chi-bot ti-chi-bot bot merged commit e75248d into pingcap:master May 17, 2024
28 checks passed
@ti-chi-bot ti-chi-bot added the needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. label May 17, 2024
@ti-chi-bot
Copy link
Member

@hongyunyan: new pull request created to branch release-8.1: #11130.

In response to this:

/cherry-pick release-8.1

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
Copy link
Member

In response to a cherrypick label: new pull request could not be created: failed to create pull request against pingcap/tiflow#release-8.1 from head ti-chi-bot:cherry-pick-11117-to-release-8.1: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"A pull request already exists for ti-chi-bot:cherry-pick-11117-to-release-8.1."}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request"}

@lidezhu lidezhu added the needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. label May 21, 2024
@lidezhu
Copy link
Collaborator

lidezhu commented May 21, 2024

/run-cherry-picker

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.5: #11155.

@lidezhu lidezhu added needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. labels May 27, 2024
@lidezhu
Copy link
Collaborator

lidezhu commented May 27, 2024

/run-cherry-picker

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #11180.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.1: #11181.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

redo apply panic: "insert events should be emitted after other kinds of events in the same transaction"
5 participants