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

log-backup: restore meta kv with batch method (#37100) #37139

Merged
merged 2 commits into from
Aug 16, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Aug 16, 2022

cherry-pick #37100 to release-6.2
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/37139

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

git push git@github.com:ti-srebot/tidb.git pr/37139:release-6.2-477f3a27c618

Signed-off-by: joccau zak.zhao@pingcap.com

What problem does this PR solve?

Issue Number: close #37111

Problem Summary:

  • Failed to restore index after PiTR to down-stream cluster.
  • The current reason for this issue is that the same meta KV appears multiple times and is overwritten by the old KV record after restoring to the latest tableInfo.

What is changed and how it works?

Set a lots of batch kv files and sort and restore these kv entries in batch files.

Check List

Tests

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

Manual test

  • reproduce the test in log-backup: failed to restore index using PiTR #37111
  • The result after PiTR with old code
    MySQL [(none)]> show create table test.sbtest43; | sbtest43 | CREATE TABLEsbtest43(idint(11) NOT NULL AUTO_INCREMENT,kint(11) NOT NULL DEFAULT '0',cchar(120) NOT NULL DEFAULT '',pad char(60) NOT NULL DEFAULT '', PRIMARY KEY (id) /*T![clustered_index] CLUSTERED */ ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin AUTO_INCREMENT=1019915 |
  • The result after PiTR with modified code
    MySQL [(none)]> show create table test.sbtest43; | sbtest43 | CREATE TABLEsbtest43(idint(11) NOT NULL AUTO_INCREMENT,kint(11) NOT NULL DEFAULT '0',cchar(120) NOT NULL DEFAULT '',pad char(60) NOT NULL DEFAULT '', PRIMARY KEY (id) /*T![clustered_index] CLUSTERED */, KEY k_43 (k) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin AUTO_INCREMENT=1019915 |

The Key K-43(``) has been restored in above test.

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

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

None

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 16, 2022

[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 do-not-merge/cherry-pick-not-approved do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Aug 16, 2022
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Aug 16, 2022
@ti-srebot ti-srebot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/6.2-cherry-pick labels Aug 16, 2022
@ti-srebot
Copy link
Contributor Author

@joccau you're already a collaborator in bot's repo.

Signed-off-by: joccau <zak.zhao@pingcap.com>
@sre-bot
Copy link
Contributor

sre-bot commented Aug 16, 2022

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 16, 2022
Copy link
Contributor

@3pointer 3pointer left a comment

Choose a reason for hiding this comment

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

LGTM

@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 Aug 16, 2022
@sre-bot sre-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 16, 2022
@joccau
Copy link
Member

joccau commented Aug 16, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 9c9ad9a

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 16, 2022
@ti-chi-bot ti-chi-bot merged commit be9be01 into pingcap:release-6.2 Aug 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 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. type/6.2-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants