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

*: support recover relay log file with a subset of metadata (#530) #534

Merged
merged 2 commits into from
Mar 12, 2020

Conversation

csuzhangxc
Copy link
Member

cherry-pick #530 to release-1.0


What problem does this PR solve?

fix #443 , this should be release under v1.0.4.

What is changed and how it works?

  • support recover relay log file with a subset of metadata

    • check whether the metadata is a subset of the relay log file
  • also update go-mysql to fix GTIDSet.Equal.

Check List

Tests

  • Unit test
  • Integration test

Code changes

  • Has exported variable/fields change
  • Has persistent data change

Side effects

  • Increased code complexity

Related changes

  • Need to cherry-pick to the release branch
  • Need to be included in the release note

@csuzhangxc csuzhangxc added priority/normal Minor change, requires approval from ≥1 primary reviewer 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 Mar 12, 2020
@csuzhangxc
Copy link
Member Author

/run-all-tests tidb=release-3.0

Copy link
Contributor

@lichunzhu lichunzhu left a comment

Choose a reason for hiding this comment

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

LGTM

@WangXiangUSTC
Copy link
Contributor

LGTM

@WangXiangUSTC WangXiangUSTC added status/LGT1 One reviewer already commented LGTM status/LGT2 Two reviewers already commented LGTM, ready for merge and removed status/PTAL This PR is ready for review. Add this label back after committing new changes status/LGT1 One reviewer already commented LGTM labels Mar 12, 2020
@codecov
Copy link

codecov bot commented Mar 12, 2020

Codecov Report

Merging #534 into release-1.0 will decrease coverage by 0.0359%.
The diff coverage is 60.0000%.

@@                 Coverage Diff                 @@
##           release-1.0       #534        +/-   ##
===================================================
- Coverage      57.3194%   57.2835%   -0.0360%     
===================================================
  Files              161        161                
  Lines            16661      16654         -7     
===================================================
- Hits              9550       9540        -10     
- Misses            6167       6172         +5     
+ Partials           944        942         -2     

@csuzhangxc csuzhangxc merged commit e27bf8c into pingcap:release-1.0 Mar 12, 2020
@csuzhangxc csuzhangxc deleted the pick-530 branch March 12, 2020 12:31
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
priority/normal Minor change, requires approval from ≥1 primary reviewer status/LGT2 Two reviewers already commented LGTM, ready for merge 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