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

restore: allow restore accross one major version #33203

Merged
merged 10 commits into from
Mar 17, 2022
Merged

restore: allow restore accross one major version #33203

merged 10 commits into from
Mar 17, 2022

Conversation

3pointer
Copy link
Contributor

@3pointer 3pointer commented Mar 17, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #33182

Problem Summary:

  1. update restore check that allow restore accross one major version
  2. fix the failed integration-test
    1. after *: Fix checkHistoryJobInTest failed when br restore #33206 merged. br_sequence_and_views failed due to ActionCreateTables have both CreateSequenceStmt and CreateTableStmt make the check panic.
    2. after br: download sst again with no-crypt parameters when met decryption error for downloadSST #32847 merged. br_raw_kv failed with the wrong EndKey.

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Fix the issue that 6.0 backup data cannot restore to 5.4 cluster when `--check-requirements=true`

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 17, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • YuJuncen
  • lcwangchao

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 release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/needs-triage-completed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 17, 2022
@3pointer 3pointer requested a review from fubinzh March 17, 2022 07:02
@3pointer 3pointer added component/br This issue is related to BR of TiDB. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 17, 2022
@ti-chi-bot ti-chi-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 17, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Mar 17, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/aa68c799ae1c4d769f720833b5806d12ade2d012

@3pointer
Copy link
Contributor Author

/run-integration-br-tests

2 similar comments
@3pointer
Copy link
Contributor Author

/run-integration-br-tests

@3pointer
Copy link
Contributor Author

/run-integration-br-tests

@3pointer
Copy link
Contributor Author

/run-integration-br-tests

@3pointer
Copy link
Contributor Author

/run-integration-br-tests

1 similar comment
@3pointer
Copy link
Contributor Author

/run-integration-br-tests

@3pointer
Copy link
Contributor Author

/run-integration-br-tests

@3pointer
Copy link
Contributor Author

/run-integration-br-tests

@3pointer
Copy link
Contributor Author

/run-integration-br-tests

@3pointer 3pointer requested a review from joccau March 17, 2022 12:16
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 17, 2022
@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 Mar 17, 2022
@lcwangchao
Copy link
Collaborator

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: aa68c79

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 17, 2022
@3pointer
Copy link
Contributor Author

/run-integration-br-tests

@ti-chi-bot ti-chi-bot merged commit e130e52 into pingcap:master Mar 17, 2022
@ti-srebot
Copy link
Contributor

cherry pick to release-6.0 failed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@YuJuncen YuJuncen YuJuncen approved these changes

@lcwangchao lcwangchao lcwangchao approved these changes

@fubinzh fubinzh Awaiting requested review from fubinzh

@joccau joccau Awaiting requested review from joccau

Assignees
No one assigned
Labels
component/br This issue is related to BR of TiDB. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 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.

backup of tidb 6.0 can't be restored to tidb 5.4
7 participants
@3pointer @ti-chi-bot @sre-bot @lcwangchao @ti-srebot @YuJuncen @purelind