Skip to content

raw_restore: fix the issue that raw restore rewrite the t prefix keys (#35641)#35695

Merged
ti-chi-bot merged 2 commits intopingcap:release-5.4from
ti-srebot:release-5.4-fde7c36e10bf
Jun 24, 2022
Merged

raw_restore: fix the issue that raw restore rewrite the t prefix keys (#35641)#35695
ti-chi-bot merged 2 commits intopingcap:release-5.4from
ti-srebot:release-5.4-fde7c36e10bf

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jun 23, 2022 •
edited
Loading

cherry-pick #35641 to release-5.4
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/35695

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

git push git@github.com:ti-srebot/tidb.git pr/35695:release-5.4-fde7c36e10bf

What problem does this PR solve?

Issue Number: close #35279

Problem Summary:

What is changed and how it works?

Check List

Tests

  • Integration test
  • Manual test (add detailed scripts or steps below)
    before this PR

image

Release note

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

fix the issue that raw restore rewrite the t prefix keys

@3pointer @ti-srebot
cherry pick pingcap#35641 to release-5.4
704fada 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jun 23, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • fengou1
  • joccau

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.

Details

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 Jun 23, 2022
@ti-srebot
Copy link
Contributor Author

ti-srebot commented Jun 23, 2022

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. 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 Jun 23, 2022
@ti-srebot ti-srebot mentioned this pull request Jun 23, 2022
Merged
2 tasks
@ti-srebot ti-srebot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.4-cherry-pick labels Jun 23, 2022
@ti-srebot ti-srebot requested review from glorv and pingyu June 23, 2022 12:13
@ti-srebot ti-srebot added this to the v5.4.1 milestone Jun 23, 2022
@ti-srebot
Copy link
Contributor Author

ti-srebot commented Jun 23, 2022

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

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jun 24, 2022
joccau
joccau approved these changes Jun 24, 2022
View reviewed changes
Copy link
Contributor

@joccau joccau 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 the status/LGT1 Indicates that a PR has LGTM 1. label Jun 24, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jun 24, 2022

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

@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 Jun 24, 2022
@3pointer
Copy link
Contributor

3pointer commented Jun 24, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jun 24, 2022

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

DetailsCommit hash: 2500c63

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 24, 2022
@ti-chi-bot ti-chi-bot merged commit 73df8da into pingcap:release-5.4 Jun 24, 2022
@heibaijian heibaijian modified the milestones: v5.4.1, v5.4.2 Jun 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@glorv glorv Awaiting requested review from glorv

@pingyu pingyu Awaiting requested review from pingyu

2 more reviewers

@joccau joccau joccau approved these changes

@fengou1 fengou1 fengou1 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@3pointer 3pointer

Labels

cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 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/5.4-cherry-pick

Projects

None yet

Milestone

v5.4.2

Development

Successfully merging this pull request may close these issues.

8 participants

@ti-srebot @ti-chi-bot @sre-bot @3pointer @joccau @fengou1 @VelocityLight @heibaijian