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

syncer(dm): fix startGTID is equal to endGTID #4386

Merged
merged 13 commits into from
Feb 13, 2022
Merged

syncer(dm): fix startGTID is equal to endGTID #4386

merged 13 commits into from
Feb 13, 2022

Conversation

lance6716
Copy link
Contributor

What problem does this PR solve?

Issue Number: ref #4287

What is changed and how it works?

originally sometimes startGTID is equal to endGTID, but we want to maintain that startLocation <= current event <= endLocation

also remove some log, because I think their effect has been achieved.

Check List

Tests

  • Unit test

Code changes

Side effects

Related changes

Release note 

 `None`.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jan 18, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Ehco1996
  • GMHDBJD

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 the release-note-none Denotes a PR that doesn't merit a release note. label Jan 18, 2022
@lance6716 lance6716 added the area/dm Issues or PRs related to DM. label Jan 18, 2022
@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 18, 2022
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 18, 2022
Ehco1996
Ehco1996 reviewed Jan 26, 2022
View reviewed changes
dm/pkg/binlog/position.go Show resolved Hide resolved
dm/syncer/binlog_locations.go Show resolved Hide resolved
@codecov-commenter
Copy link

codecov-commenter commented Jan 26, 2022 •
edited
Loading

Codecov Report

Merging #4386 (1fdd729) into master (9607554) will decrease coverage by 0.0686%.
The diff coverage is 60.6557%.

Flag Coverage Δ
cdc 60.4009% <59.3750%> (+0.4787%) ⬆️
dm 51.4157% <61.2565%> (-0.6132%) ⬇️

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

@@               Coverage Diff                @@
##             master      #4386        +/-   ##
================================================
- Coverage   55.6402%   55.5716%   -0.0687%     
================================================
  Files           494        504        +10     
  Lines         61283      62226       +943     
================================================
+ Hits          34098      34580       +482     
- Misses        23750      24205       +455     
- Partials       3435       3441         +6

GMHDBJD
GMHDBJD approved these changes Feb 7, 2022
View reviewed changes
Copy link
Contributor

@GMHDBJD GMHDBJD left a comment

Choose a reason for hiding this comment

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

LGTM

dm/syncer/binlog_locations.go Outdated
err = l.curEndLocation.GetGTID().Update(gtidStr)
if err != nil {
log.L().DPanic("failed to update GTID set",
zap.Any("GTID", gtidStr),
Copy link
Contributor

Choose a reason for hiding this comment

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

zap.String?

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 7, 2022
Ehco1996
Ehco1996 approved these changes Feb 11, 2022
View reviewed changes
Copy link
Contributor

@Ehco1996 Ehco1996 left a comment

Choose a reason for hiding this comment

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

LGTM

@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 Feb 11, 2022
@lance6716
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 1be1a07

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

/run-dm-integration-test

@lance6716
Copy link
Contributor Author

/hold

need fix test

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 11, 2022
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Feb 11, 2022
@lance6716
Copy link
Contributor Author

/unhold
/merge

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 11, 2022
@ti-chi-bot
Copy link
Member

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

Commit hash: 68ac55f

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

/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 11, 2022
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Feb 11, 2022
@lance6716
Copy link
Contributor Author

/run-dm-integration-test

@lance6716
Copy link
Contributor Author

/run-dm-integration-test

@lance6716
Copy link
Contributor Author

/run-verify

@lance6716
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 1fdd729

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

/unhold

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 13, 2022
@ti-chi-bot ti-chi-bot merged commit c48f208 into pingcap:master Feb 13, 2022
zhaoxinyu pushed a commit to zhaoxinyu/ticdc that referenced this pull request Feb 16, 2022
@lance6716 @zhaoxinyu
syncer(dm): fix startGTID is equal to endGTID (pingcap#4386)
97cc9f3 
ref pingcap#4287
This was referenced Mar 1, 2022
Closed
Closed
@lance6716 lance6716 deleted the fix-gtid-locations branch October 13, 2022 08:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GMHDBJD GMHDBJD GMHDBJD approved these changes

@Ehco1996 Ehco1996 Ehco1996 approved these changes

Assignees
No one assigned
Labels
area/dm Issues or PRs related to DM. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 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
@lance6716 @ti-chi-bot @codecov-commenter @Ehco1996 @GMHDBJD