Skip to content
This repository has been archived by the owner on Nov 24, 2023. It is now read-only.

streamer: fix duplicate event when reparse relay using GTID (#1525) #1532

Merged
merged 3 commits into from
Mar 29, 2021
Merged

streamer: fix duplicate event when reparse relay using GTID (#1525) #1532

merged 3 commits into from
Mar 29, 2021

Conversation

ti-srebot
Copy link

@ti-srebot ti-srebot commented Mar 24, 2021 •
edited
Loading

cherry-pick #1525 to release-2.0
You can switch your code base to this Pull Request by using git-extras:

# In dm repo:
git pr https://github.com/pingcap/dm/pull/1532

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/dm.git pr/1532:release-2.0-47b68f9bfa8d

What problem does this PR solve?

part of #1524

What is changed and how it works?

when DM uses GTID and needs to return a reparse location, return last XID location so that replaceWithHeartbeat will be correctly calculated

Check List

Tests

  • Unit test

Code changes

Side effects

Related changes

  • Need to cherry-pick to the release branch

@lance6716 @ti-srebot
cherry pick pingcap#1525 to release-2.0
a6607e7 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Mar 24, 2021
Merged
@ti-srebot ti-srebot added size/L status/PTAL This PR is ready for review. Add this label back after committing new changes type/cherry-pick This PR is just a cherry-pick (backport) labels Mar 24, 2021
@lance6716
Copy link
Collaborator

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 One reviewer already commented LGTM label Mar 25, 2021
@lance6716
Copy link
Collaborator

/auto-cc

This was referenced Mar 25, 2021
Closed
Merged
GMHDBJD
GMHDBJD approved these changes Mar 29, 2021
View reviewed changes
Copy link
Collaborator

@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

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • GMHDBJD
  • lance6716

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added status/LGT2 Two reviewers already commented LGTM, ready for merge and removed status/LGT1 One reviewer already commented LGTM labels Mar 29, 2021
@lance6716
Copy link
Collaborator

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 47f3bb5

@lance6716
Copy link
Collaborator

/run-all-tests

@ti-chi-bot ti-chi-bot merged commit 9947467 into pingcap:release-2.0 Mar 29, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@GMHDBJD GMHDBJD GMHDBJD approved these changes

@5kbpers 5kbpers Awaiting requested review from 5kbpers

@lichunzhu lichunzhu Awaiting requested review from lichunzhu

@3pointer 3pointer Awaiting requested review from 3pointer

@kennytm kennytm Awaiting requested review from kennytm

@lance6716 lance6716 Awaiting requested review from lance6716

Assignees
No one assigned
Labels
first-time-contributor size/L status/can-merge status/LGT2 Two reviewers already commented LGTM, ready for merge status/PTAL This PR is ready for review. Add this label back after committing new changes type/cherry-pick This PR is just a cherry-pick (backport)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ti-srebot @lance6716 @ti-chi-bot @GMHDBJD