Skip to content

br: filter resource group in br full restore#42267

Merged
ti-chi-bot merged 1 commit into
pingcap:masterfrom
glorv:br-rg
Mar 16, 2023
Merged

br: filter resource group in br full restore#42267
ti-chi-bot merged 1 commit into
pingcap:masterfrom
glorv:br-rg

Conversation

@glorv
Copy link
Copy Markdown
Contributor

@glorv glorv commented Mar 15, 2023

What problem does this PR solve?

Issue Number: ref #42266

Problem Summary:

What is changed and how it works?

Because we decided not to support backup&restore resource control related data in v7.0, this PR try to remove the resource group meta in user_attributes.

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

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

None

@glorv glorv requested review from 3pointer, YuJuncen and nolouch March 15, 2023 09:44
@ti-chi-bot
Copy link
Copy Markdown
Member

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • YuJuncen
  • nolouch

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 release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 15, 2023
@glorv glorv mentioned this pull request Mar 15, 2023
Closed
41 tasks
@glorv
Copy link
Copy Markdown
Contributor Author

glorv commented Mar 15, 2023

/run-br-intergration-tests

@glorv
Copy link
Copy Markdown
Contributor Author

glorv commented Mar 15, 2023

/test br-intergration-tests

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Mar 15, 2023

@glorv: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test build
  • /test check-dev
  • /test check-dev2
  • /test mysql-test
  • /test unit-test

Use /test all to run all jobs.

Details

In response to this:

/test br-intergration-tests

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@glorv
Copy link
Copy Markdown
Contributor Author

glorv commented Mar 15, 2023

/run-intergration-br-tests

@3pointer
Copy link
Copy Markdown
Contributor

3pointer commented Mar 15, 2023

/run-integration-br-test

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 16, 2023
@nolouch
Copy link
Copy Markdown
Member

nolouch commented Mar 16, 2023

/run-integration-br-test

@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 16, 2023
@glorv
Copy link
Copy Markdown
Contributor Author

glorv commented Mar 16, 2023

/run-integration-br-test

@glorv
Copy link
Copy Markdown
Contributor Author

glorv commented Mar 16, 2023

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Mar 16, 2023

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

DetailsCommit hash: 12e0b26

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 16, 2023
@ti-chi-bot ti-chi-bot merged commit af60ff8 into pingcap:master Mar 16, 2023
YuJuncen
YuJuncen reviewed Mar 17, 2023
View reviewed changes
Comment thread br/pkg/restore/systable_restore.go
// TODO: this function should be removed when we support backup and restore
// resource group.
if tableName == sysUserTableName {
sql := fmt.Sprintf("UPDATE %s SET User_attributes = JSON_REMOVE(User_attributes, '$.resource_group');",
Copy link
Copy Markdown
Contributor

@YuJuncen YuJuncen Mar 17, 2023

Choose a reason for hiding this comment

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

When restoring from older backup archives, this SQL may fail.

Copy link
Copy Markdown
Contributor Author

@glorv glorv Mar 17, 2023

Choose a reason for hiding this comment

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

why this sql will fail, it's noop if the user_attributes contains no resoure_group field

Copy link
Copy Markdown
Contributor

@YuJuncen YuJuncen Mar 20, 2023

Choose a reason for hiding this comment

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

[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'

I'm not sure, perhaps earlier backups may not contain the user_attributes row?

Copy link
Copy Markdown
Contributor Author

@glorv glorv Mar 20, 2023

Choose a reason for hiding this comment

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

em.. User Attributes is added in #38201, I supposed it had existed longer. Maybe we shoulud check the tidb version here.

@glorv glorv deleted the br-rg branch December 15, 2023 08:39
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

@nolouch nolouch nolouch approved these changes

@3pointer 3pointer Awaiting requested review from 3pointer

Assignees

No one assigned

Labels

release-note-none Denotes a PR that doesn't merit a release note. 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.

5 participants

@glorv @ti-chi-bot @3pointer @nolouch @YuJuncen