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

br: make restore resource group compatible with old tidb #42388

Merged
merged 2 commits into from
Mar 21, 2023
Merged

br: make restore resource group compatible with old tidb #42388

merged 2 commits into from
Mar 21, 2023

Conversation

glorv
Copy link
Contributor

@glorv glorv commented Mar 20, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: ref #42266, close #42365

Problem Summary:

What is changed and how it works?

Before v6.4.0, mysq.user don't contains the User_attributes, so should not return error in the old tidb.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • Before this change, restore to an old tidb with result in error like [BR:Common:ErrUnknown]failed to execute UPDATE __tidb_br_temporary_mysql.user SET User_attributes = JSON_REMOVE(User_attributes, '$.resource_group');: [planner:1054]Unknown column 'User_attributes' in 'field list', after this change it can restore successfully.
  • 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

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

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 20, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • YuJuncen

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-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 20, 2023
@glorv glorv requested review from YuJuncen and 3pointer March 20, 2023 05:18
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 20, 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 Mar 20, 2023
@glorv
Copy link
Contributor Author

glorv commented Mar 20, 2023

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 849c45b

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 20, 2023
@glorv
Copy link
Contributor Author

glorv commented Mar 20, 2023

/retest

1 similar comment
@glorv
Copy link
Contributor Author

glorv commented Mar 20, 2023

/retest

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Mar 20, 2023
@glorv
Copy link
Contributor Author

glorv commented Mar 20, 2023

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 2cffac5

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

/retest

@glorv
Copy link
Contributor Author

glorv commented Mar 21, 2023

/test unit-test

@ti-chi-bot ti-chi-bot merged commit 8ba2035 into pingcap:master Mar 21, 2023
@glorv glorv deleted the fix-br-rg branch March 21, 2023 05:03
@3pointer 3pointer mentioned this pull request Mar 21, 2023
Closed
@glorv
Copy link
Contributor Author

glorv commented Mar 21, 2023

/run-cherry-picker

@ti-chi-bot ti-chi-bot mentioned this pull request Mar 21, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot added a commit that referenced this pull request Mar 21, 2023
@ti-chi-bot
br: make restore resource group compatible with old tidb (#42388) (#4…
a4ab759 
…2418)

ref #42266, close #42365
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@3pointer 3pointer 3pointer approved these changes

@YuJuncen YuJuncen YuJuncen approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-7.0 release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 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.

BR restore system table fail
5 participants
@glorv @ti-chi-bot @hawkingrei @3pointer @YuJuncen