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

sink(ticdc): Fix a slice overwriting problem #7759

Merged
merged 2 commits into from
Dec 1, 2022
Merged

sink(ticdc): Fix a slice overwriting problem #7759

merged 2 commits into from
Dec 1, 2022

Conversation

zhaoxinyu
Copy link
Contributor

@zhaoxinyu zhaoxinyu commented Dec 1, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: ref #6797

What is changed and how it works?

  • Before this PR:
    When iterating events in L143:

    tiflow/cdc/sinkv2/eventsink/cloudstorage/dml_worker.go

    Lines 135 to 143 in e7e2894

    events := d.tableEvents.fragments[table]
    d.tableEvents.fragments[table] = d.tableEvents.fragments[table][:0]
    d.tableEvents.mu.Unlock()
    if len(events) == 0 {
    continue
    }
    rowsCnt := 0
    for _, frag := range events {

    some items may have been mistakenly overwritten by L256, so the table checkpoint will not be updated anymore.

    tiflow/cdc/sinkv2/eventsink/cloudstorage/dml_worker.go

    Lines 255 to 257 in e7e2894

    d.tableEvents.mu.Lock()
    d.tableEvents.fragments[table] = append(d.tableEvents.fragments[table], frag)
    d.tableEvents.mu.Unlock()

  • After this PR:
    Clone a new slice to detach with the old one, so as to prevent the slice overwriting problem from happening.

Check List

Tests

  • Unit test

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

ti-chi-bot commented Dec 1, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3AceShowHand
  • asddongmen

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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 1, 2022
@zhaoxinyu
Copy link
Contributor Author

/cc @asddongmen
/cc @3AceShowHand

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 1, 2022
@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 Dec 1, 2022
@zhaoxinyu
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: f1e75cd

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 1, 2022
@ti-chi-bot
Copy link
Member

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

@zhaoxinyu
Copy link
Contributor Author

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

@zhaoxinyu
Copy link
Contributor Author

/run-integration-test

@asddongmen
Copy link
Contributor

/merge

@zhaoxinyu
Copy link
Contributor Author

/run-integration-test

1 similar comment
@zhaoxinyu
Copy link
Contributor Author

/run-integration-test

@zhaoxinyu
Copy link
Contributor Author

/run-integration-test tidb=release-6.4

@nongfushanquan
Copy link
Contributor

/run-integration-test

@zhaoxinyu
Copy link
Contributor Author

/run-integration-test tidb=f5487e3f2596cdd63ae9840606c7fff3fb539e03

@zhaoxinyu
Copy link
Contributor Author

/run-integration-test tidb=@f5487e3f2596cdd63ae9840606c7fff3fb539e03

@zhaoxinyu
Copy link
Contributor Author

/run-integration-test /tidb=/pr/39427

@zhaoxinyu
Copy link
Contributor Author

/run-integration-test tidb=f5487e3f2596cdd63ae9840606c7fff3fb539e03

2 similar comments
@zhaoxinyu
Copy link
Contributor Author

/run-integration-test tidb=f5487e3f2596cdd63ae9840606c7fff3fb539e03

@zhaoxinyu
Copy link
Contributor Author

/run-integration-test tidb=f5487e3f2596cdd63ae9840606c7fff3fb539e03

@ti-chi-bot ti-chi-bot merged commit 9ef9702 into pingcap:master Dec 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@asddongmen asddongmen asddongmen approved these changes

@3AceShowHand 3AceShowHand 3AceShowHand approved these changes

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 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.
5 participants
@zhaoxinyu @ti-chi-bot @asddongmen @nongfushanquan @3AceShowHand