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.

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

sst_importer: Fix MvccProperties didn't generated during restoring (#… #6378

Merged

Conversation

MyonKeminta
Copy link
Contributor

…6349)

Signed-off-by: MyonKeminta MyonKeminta@users.noreply.github.com

What have you changed?

This PR cherry-picks #6349 , which fixes the bug that imported sst doesn't has MvccProperties.

What is the type of the changes?

  • Bugfix (a change which fixes an issue)

How is the PR tested?

  • Unit test

Does this PR affect documentation (docs) or should it be mentioned in the release notes?

No

Does this PR affect tidb-ansible?

No

Refer to a related PR or issue link (optional)

Cherry-picks: #6349

…ikv#6349)

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
@MyonKeminta MyonKeminta added type/cherry-pick Type: PR - Cherry pick component/backup-restore Component: backup, import, external_storage labels Dec 31, 2019
@MyonKeminta
Copy link
Contributor Author

@overvenus @5kbpers PTAL.
btw release-3.1 branch doesn't has the test_sst_importer workspace, so I moved the definition of the test property collector to sst_importer.rs, which introduced more difference between master and release-3.1 branch. Comment if you have better idea.

Copy link
Member

@5kbpers 5kbpers left a comment

Choose a reason for hiding this comment

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

LGTM

@overvenus
Copy link
Member

/run-integration-tests

Copy link
Member

@overvenus overvenus left a comment

Choose a reason for hiding this comment

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

LGTM

@overvenus overvenus added this to the v3.1.0-beta.1 milestone Jan 2, 2020
@AndreMouche AndreMouche merged commit ea7de98 into tikv:release-3.1 Jan 2, 2020
@MyonKeminta MyonKeminta deleted the m/fix-sst-writer-cf-not-set-3.1 branch January 6, 2020 08:46
@AndreMouche AndreMouche mentioned this pull request Jan 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/backup-restore Component: backup, import, external_storage type/cherry-pick Type: PR - Cherry pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants