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

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

Merged
merged 3 commits into from
Feb 17, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Dec 30, 2021

cherry-pick #31089 to release-5.3
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/31152

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

git push git@github.com:ti-srebot/tidb.git pr/31152:release-5.3-9325c91a75d6

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.

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

ti-chi-bot commented Dec 30, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • glorv
  • kennytm

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-srebot
Copy link
Contributor Author

/run-all-tests

@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. 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 Dec 30, 2021
@ti-srebot ti-srebot added component/lightning This issue is related to Lightning of TiDB. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.3-cherry-pick type/bugfix This PR fixes a bug. labels Dec 30, 2021
@ti-srebot
Copy link
Contributor Author

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

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 30, 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 Jan 6, 2022
@kennytm
Copy link
Contributor

kennytm commented Jan 6, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 17442d2

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 6, 2022
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Feb 16, 2022
@ti-chi-bot ti-chi-bot merged commit 921ca98 into pingcap:release-5.3 Feb 17, 2022
@purelind purelind added this to the v5.3.1 milestone Feb 24, 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. component/lightning This issue is related to Lightning of TiDB. 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. type/5.3-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants