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

relay: align with MySQL when using GTID (#1390) #1403

Merged
merged 1 commit into from
Jan 27, 2021

Conversation

ti-srebot
Copy link

@ti-srebot ti-srebot commented Jan 26, 2021

cherry-pick #1390 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/1403

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

git push git@github.com:ti-srebot/dm.git pr/1403:release-2.0-3cb465b3218f

What problem does this PR solve?

close #1383

What is changed and how it works?

  • getPosByGTID always return the begin pos of the collect relay log file (filename, 4)
  • startSyncByGTID should replace event to heartbeat event which already be contained for specified gtid set
  • adjust gtid for relay

Check List

Tests

  • Unit test

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot added needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated status/PTAL This PR is ready for review. Add this label back after committing new changes type/bug-fix Bug fix type/cherry-pick This PR is just a cherry-pick (backport) labels Jan 26, 2021
@lance6716 lance6716 merged commit fc323d8 into pingcap:release-2.0 Jan 27, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated status/PTAL This PR is ready for review. Add this label back after committing new changes type/bug-fix Bug fix type/cherry-pick This PR is just a cherry-pick (backport)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants