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

restore: split between tables #42972

Merged
merged 1 commit into from
Apr 18, 2023
Merged

Conversation

YuJuncen
Copy link
Contributor

@YuJuncen YuJuncen commented Apr 12, 2023

What problem does this PR solve?

Issue Number: close #42924

Problem Summary:
When restoring tables, for optimization, we are not going to split between tables:
(Referencing #27240)

before:
--|-------t1 data-------|-----|---t2 data-------|
after: 
----------t1 data-------|---------t2 data-------|

Legends:
'|' the split point
'-' the key space

This works fine as long as we are restoring tables sequentially and restoring tables after we finish splitting. However, for now, in some scenarios:

  1. t2 starts its restoration, importing file to the very left region.
  2. t1 starts its restoration too, and split region from left to right -- the table may be huge and take a long time to split the regions.
  3. Newly split regions will be born from the very right region of t1, i.e. the very left region of t2. Which means... this region's epoch would change frequently, which probably blocks the import of t2.

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
    We detected this problem in an internal cluster, where v7.0.0 BR consistently fails, and with this PR we can restore to the cluster.
  • (Almost) No code

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

Fixed a bug that may cause BR failed to restore due to "epoch not match".

Signed-off-by: hillium <[email protected]>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 12, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • Leavrth

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. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. and removed do-not-merge/needs-triage-completed labels Apr 12, 2023
@YuJuncen YuJuncen requested review from 3pointer and Leavrth April 13, 2023 06:34
@ti-chi-bot ti-chi-bot added needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. and removed do-not-merge/needs-triage-completed labels Apr 17, 2023
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 17, 2023
@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 Apr 18, 2023
@YuJuncen
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 748fb23

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 18, 2023
@hawkingrei
Copy link
Member

/retest

1 similar comment
@hawkingrei
Copy link
Member

/retest

@ti-chi-bot ti-chi-bot merged commit 36c59c7 into pingcap:master Apr 18, 2023
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-5.4: #43164.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Apr 18, 2023
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.1: #43165.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Apr 18, 2023
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #43166.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-5.3: #43167.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Apr 18, 2023
YuJuncen added a commit that referenced this pull request Apr 26, 2023
ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request May 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. 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
Development

Successfully merging this pull request may close these issues.

v7.0.0 br restore hit error "[BR:KV:ErrKVEpochNotMatch]epoch not match"
5 participants