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

lightning: don't ignore error if check new collation failed #31089

Merged
merged 7 commits into from
Dec 30, 2021
Merged

lightning: don't ignore error if check new collation failed #31089

merged 7 commits into from
Dec 30, 2021

Conversation

glorv
Copy link
Contributor

@glorv glorv commented Dec 28, 2021

What problem does this PR solve?

Issue Number: close #31088

Problem Summary:

What is changed and how it works?

Do not ignore the error when execute query SELECT variable_value FROM mysql.tidb WHERE variable_name = 'new_collation_enabled', if the return err is sql.NORows, lightning will treat it as false, otherwise, directly return an error and exit.

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

Fix the error that if tidb-lightning doesn't has permission to access mysql.tidb, it will generate kv with wrong format.

@glorv glorv added type/bugfix This PR fixes a bug. needs-cherry-pick-release-5.2 component/lightning This issue is related to Lightning of TiDB. needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 labels Dec 28, 2021
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 28, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • gozssky
  • lance6716

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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 28, 2021
@sre-bot
Copy link
Contributor

sre-bot commented Dec 28, 2021 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/4ca5fa1e5e0862a1dbce13beaa8d9fa9e92a8e99

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 28, 2021
@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 Dec 29, 2021
wjhuang2016
wjhuang2016 reviewed Dec 29, 2021
View reviewed changes
br/pkg/lightning/restore/tidb.go
@@ -379,9 +379,13 @@ func ObtainNewCollationEnabled(ctx context.Context, g glue.SQLExecutor) bool {
)
if err == nil && newCollationVal == "True" {
newCollationEnabled = true
} else if errors.ErrorEqual(err, sql.ErrNoRows) {
// ignore if target variable is not found, this may happen if tidb < v4.0
newCollationEnabled = false
Copy link
Member

Choose a reason for hiding this comment

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

No need to set it.

@glorv
Copy link
Contributor Author

glorv commented Dec 30, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: fc19f58

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 30, 2021
@sre-bot
Copy link
Contributor

sre-bot commented Dec 30, 2021

Please follow PR Title Format:

  • pkg [, pkg2, pkg3]: what is changed

Or if the count of mainly changed packages are more than 3, use

  • *: what is changed

After you have format title, you can leave a comment /run-check_title to recheck it

@ti-chi-bot ti-chi-bot merged commit 9325c91 into pingcap:master Dec 30, 2021
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Dec 30, 2021
@glorv @ti-srebot
cherry pick pingcap#31089 to release-5.2
70ef3d5 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Dec 30, 2021
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.2 in PR #31151

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Dec 30, 2021
@glorv @ti-srebot
cherry pick pingcap#31089 to release-5.3
17442d2 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Dec 30, 2021
Merged
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.3 in PR #31152

@3pointer 3pointer mentioned this pull request Jan 14, 2022
Merged
14 tasks
ti-chi-bot pushed a commit that referenced this pull request Feb 17, 2022
@ti-srebot
lightning: don't ignore error if check new collation failed (#31089) (#…
921ca98 
…31152)

close #31088
@glorv glorv deleted the check-collation branch February 18, 2022 08:00
ti-chi-bot pushed a commit that referenced this pull request Apr 13, 2022
@ti-srebot
lightning: don't ignore error if check new collation failed (#31089) (#…
13839f8 
…31151)

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

@wjhuang2016 wjhuang2016 wjhuang2016 left review comments

@lance6716 lance6716 lance6716 approved these changes

@sleepymole sleepymole sleepymole approved these changes

@kennytm kennytm Awaiting requested review from kennytm

Assignees
No one assigned
Labels
component/lightning This issue is related to Lightning of TiDB. needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 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/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

tidb-lightning import wrong data if user doesn't has right permission
7 participants
@glorv @ti-chi-bot @sre-bot @ti-srebot @lance6716 @sleepymole @wjhuang2016