cdc(ddl): ensure strict ordering for multi-table DDLs after split (#12450) #12460
Conversation
Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot
added
do-not-merge/hold
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
This cherry pick PR is for a release branch and has not yet been approved by triage owners. To merge this cherry pick:
DetailsInstructions 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 kubernetes-sigs/prow repository. |
|
@wlwilliamx This PR has conflicts, I have hold it. |
|
@ti-chi-bot: ## If you want to know how to resolve it, please read the guide in TiDB Dev Guide. DetailsInstructions 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. |
Summary of ChangesHello @ti-chi-bot, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request resolves a critical data consistency problem in the Change Data Capture (CDC) system. Previously, DDL events resulting from complex multi-table Highlights
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request correctly addresses an ordering issue with split DDLs from multi-table RENAME statements by introducing a sequence number (Seq) to DDLEvent. The logic to assign and use this sequence number in schema_storage.go and ddl_manager.go appears sound. The accompanying changes in the generated file sink_gen.go also include a beneficial refactoring that improves code maintainability by delegating RedoDDLEvent's serialization to DDLEvent's methods. However, there is a critical issue in cdc/model/sink.go where merge conflict markers have been left in the code, which will prevent compilation. This must be resolved.
| <<<<<<< HEAD | ||
| ======= | ||
| // BDRRole is the role of the TiDB cluster, it is used to determine whether | ||
| // the DDL is executed by the primary cluster. | ||
| BDRRole string `msg:"-"` | ||
| SQLMode mysql.SQLMode `msg:"-"` | ||
| // Seq is used to order the DDLs with the same commit ts | ||
| // Only used in the splited DDLEvent generated by a multi-table DDL, | ||
| // we need to keep the order of the original multi-table DDL | ||
| Seq uint64 `msg:"seq"` | ||
| >>>>>>> 3c7fd0a1fd (cdc(ddl): ensure strict ordering for multi-table DDLs after split (#12450)) |
There was a problem hiding this comment.
This file contains merge conflict markers (<<<<<<<, =======, >>>>>>>) which will cause a compilation failure. These markers should be removed, and the code should be resolved to include the intended changes.
// BDRRole is the role of the TiDB cluster, it is used to determine whether
// the DDL is executed by the primary cluster.
BDRRole string `msg:"-"`
SQLMode mysql.SQLMode `msg:"-"`
// Seq is used to order the DDLs with the same commit ts
// Only used in the splited DDLEvent generated by a multi-table DDL,
// we need to keep the order of the original multi-table DDL
Seq uint64 `msg:"seq"`
|
@ti-chi-bot: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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 kubernetes-sigs/prow repository. I understand the commands that are listed here. |
2 participants
This is an automated cherry-pick of #12450
What problem does this PR solve?
Issue Number: close #12449
What is changed and how it works?
This PR addresses an issue where split DDLs from a multi-table
RENAMEstatement could be executed out of order downstream because they share the sameCommitTsand the order of ranging map is non-deterministic.Check List
Tests
Questions
Will it cause performance regression or break compatibility?
None
Do you need to update user documentation, design documentation or monitoring documentation?
None
Release note