sink(ticdc): fix a bug that may cause data loss while closing Writer failed (#12437) #12440
Conversation
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot
added
do-not-merge/hold
|
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. |
|
@wk989898 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 potential data loss scenario within the TiCDC cloud storage sink. Previously, a failure to properly close the data writer would not propagate its error, leading to DMLs being considered successfully uploaded when they were not. The changes ensure that such critical errors are caught and handled, preventing data loss and maintaining the integrity of the changefeed by forcing a restart upon writer closure failure. 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 aims to fix a potential data loss bug by properly handling errors from writer.Close. The logical change is correct and addresses the issue. However, the current implementation includes git conflict markers and references to undefined variables (start and metricFlushDuration), which will prevent the code from compiling. I've provided a critical review comment with a code suggestion to clean up the code and fix these issues while retaining the important bug fix.
| if _, inErr = writer.Write(ctx, buf.Bytes()); inErr != nil { | ||
| return 0, 0, inErr | ||
| } | ||
| <<<<<<< HEAD | ||
| ======= | ||
| // We have to wait the writer to close to complete the upload | ||
| // If failed to close writer, some DMLs may not be upload successfully | ||
| if inErr = writer.Close(ctx); inErr != nil { | ||
| log.Error("failed to close writer", zap.Error(inErr), | ||
| zap.Int("workerID", d.id), | ||
| zap.Any("table", task.tableInfo.TableName), | ||
| zap.String("namespace", d.changeFeedID.Namespace), | ||
| zap.String("changefeed", d.changeFeedID.ID)) | ||
| return 0, 0, inErr | ||
| } | ||
|
|
||
| d.metricFlushDuration.Observe(time.Since(start).Seconds()) | ||
| >>>>>>> 1ea739d924 (sink(ticdc): fix a bug that may cause data loss while closing Writer failed (#12437)) |
There was a problem hiding this comment.
This block of code contains git conflict markers (<<<<<<<, =======, >>>>>>>) which will cause a compilation failure. Additionally, it references an undefined variable start and an undefined field d.metricFlushDuration, which are also compilation errors.
The core logic to handle the error from writer.Close() is correct, but these issues must be resolved. The suggested code below removes the conflict markers and the problematic metric observation, leaving only the necessary bug fix.
if _, inErr = writer.Write(ctx, buf.Bytes()); inErr != nil {
return 0, 0, inErr
}
// We have to wait for the writer to close to complete the upload.
// If it fails to close, some DMLs may not be uploaded successfully.
if inErr = writer.Close(ctx); inErr != nil {
log.Error("failed to close writer", zap.Error(inErr),
zap.Int("workerID", d.id),
zap.Any("table", task.tableInfo.TableName),
zap.String("namespace", d.changeFeedID.Namespace),
zap.String("changefeed", d.changeFeedID.ID))
return 0, 0, inErr
}
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: wk989898 The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
2 participants
This is an automated cherry-pick of #12437
What problem does this PR solve?
Issue Number: close #12436
What is changed and how it works?
In the previous implementation, the error of
writer.Closewas not handled, and some DMLs may upload failed.This error should block the advance and cause the changefeed to finally restart.
Check List
Tests
Questions
Will it cause performance regression or break compatibility?
Do you need to update user documentation, design documentation or monitoring documentation?
Release note