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

redo(ticdc): use uuid in s3 log file to avoid name conflict #5595

Merged
merged 5 commits into from
May 27, 2022
Merged

redo(ticdc): use uuid in s3 log file to avoid name conflict #5595

merged 5 commits into from
May 27, 2022

Conversation

amyangfei
Copy link
Contributor

@amyangfei amyangfei commented May 25, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: ref #5486

What is changed and how it works?

  • If multiple redo log files contain event with the same commit-ts, the file name will be conflict and lead to data loss
  • Since the unix timestamp is used as random filename and no other practical use, we simplify add a uuid into redo log file name.
  • Move github.com/pingcap/tiflow/engine/pkg/uuid package to github.com/pingcap/tiflow/pkg/uuid

Check List

Tests

  • Unit test
  • Integration test

Questions

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

Release note 

Add uuid suffix to redo log file name to prevent name conflict, which may cause data loss.

@amyangfei amyangfei added type/bugfix This PR fixes a bug. component/redolog area/ticdc Issues or PRs related to TiCDC. labels May 25, 2022
@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 25, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CharlesCheung96
  • hi-rustin

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 needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 25, 2022
@amyangfei amyangfei marked this pull request as draft May 25, 2022 16:09
@ti-chi-bot ti-chi-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 25, 2022
@amyangfei amyangfei force-pushed the fix-duplicated-redo-file-name branch from cff084c to 06e0877 Compare May 26, 2022 05:51
@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 26, 2022
@amyangfei amyangfei marked this pull request as ready for review May 26, 2022 06:19
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 26, 2022
@amyangfei
Copy link
Contributor Author

/run-all-tests

@amyangfei amyangfei force-pushed the fix-duplicated-redo-file-name branch from 25f4599 to 3372d3d Compare May 26, 2022 06:47
@amyangfei
Copy link
Contributor Author

/run-all-tests

@amyangfei amyangfei added the status/ptal Could you please take a look? label May 26, 2022
@ti-chi-bot
Copy link
Member

@nongfushanquan: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

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.

Rustin170506
Rustin170506 approved these changes May 27, 2022
View reviewed changes
pkg/uuid/uuid.go Outdated
Comment on lines 16 to 18
import (
guuid "github.com/google/uuid"
)
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
import (
guuid "github.com/google/uuid"
)
import guuid "github.com/google/uuid"

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 27, 2022
@amyangfei
Copy link
Contributor Author

/run-all-tests

@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 May 27, 2022
@amyangfei
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 9140a0d

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

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

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label May 27, 2022
@amyangfei
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: f25e8b8

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 27, 2022
@amyangfei
Copy link
Contributor Author

/run-verify

@ti-chi-bot ti-chi-bot merged commit c467834 into pingcap:master May 27, 2022
ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request May 27, 2022
@amyangfei @ti-chi-bot
This is an automated cherry-pick of pingcap#5595
bd6bfdd 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request May 27, 2022
Merged
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #5613.

@amyangfei amyangfei deleted the fix-duplicated-redo-file-name branch May 27, 2022 07:05
ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request May 27, 2022
@amyangfei @ti-chi-bot
This is an automated cherry-pick of pingcap#5595
6188951 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request May 27, 2022
Merged
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #5614.

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request May 27, 2022
@amyangfei @ti-chi-bot
This is an automated cherry-pick of pingcap#5595
ea374fc 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request May 27, 2022
Merged
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #5615.

ti-chi-bot added a commit that referenced this pull request May 27, 2022
@ti-chi-bot
redo(ticdc): use uuid in s3 log file to avoid name conflict (#5595) (#…
679061c 
…5615)

ref #5486
ti-chi-bot added a commit that referenced this pull request Jun 15, 2022
@ti-chi-bot
redo(ticdc): use uuid in s3 log file to avoid name conflict (#5595) (#…
97e9cde 
…5613)

ref #5486
ti-chi-bot added a commit that referenced this pull request Jun 21, 2022
@ti-chi-bot
redo(ticdc): use uuid in s3 log file to avoid name conflict (#5595) (#…
4a0319b 
…5614)

ref #5486
@sleepymole sleepymole mentioned this pull request Aug 23, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CharlesCheung96 CharlesCheung96 CharlesCheung96 approved these changes

@nongfushanquan nongfushanquan nongfushanquan approved these changes

@maxshuang maxshuang Awaiting requested review from maxshuang

@3AceShowHand 3AceShowHand Awaiting requested review from 3AceShowHand

@overvenus overvenus Awaiting requested review from overvenus

@Rustin170506 Rustin170506 Awaiting requested review from Rustin170506

Assignees
No one assigned
Labels
area/ticdc Issues or PRs related to TiCDC. component/redolog needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 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? type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@amyangfei @ti-chi-bot @Rustin170506 @CharlesCheung96 @nongfushanquan