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

*: fix nil pointer panic of some operations when skip-grant-table is true (#29358) #29397

Merged
merged 2 commits into from
Nov 4, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Nov 3, 2021

cherry-pick #29358 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/29397

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

git push [email protected]:ti-srebot/tidb.git pr/29397:release-5.3-dc67b57c5e6a

What problem does this PR solve?

Issue Number: close #29317

Problem Summary:

When skip-grant-table is configured, some operation panic.

What is changed and how it works?

Check config.GetGlobalConfig().Security.SkipGrantTable in NotifyUpdatePrivilege, if it's set, do nothing to avoid nil pointer panic.

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 nil pointer panic of some operations when `skip-grant-table` is true

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 3, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • crazycs520
  • wjhuang2016

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/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 Nov 3, 2021
@ti-srebot ti-srebot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.3-cherry-pick labels Nov 3, 2021
@ti-srebot
Copy link
Contributor Author

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

@tiancaiamao
Copy link
Contributor

/run-check_dev

@tiancaiamao
Copy link
Contributor

Known unstable test #29283

idb_ghpr_check/go/src/github.com/pingcap/tidb/expression/builtin_json_test.go:290\ntesting.tRunner\n\t/usr/local/go/src/testing/testing.go:1193"]
[2021-11-03T07:31:54.617Z] --- FAIL: TestWeightString (0.00s)
[2021-11-03T07:31:54.617Z]     builtin_string_test.go:2634: 
[2021-11-03T07:31:54.617Z]         	Error Trace:	builtin_string_test.go:2634
[2021-11-03T07:31:54.617Z]         	Error:      	Not equal: 
[2021-11-03T07:31:54.617Z]         	            	expected: "a "
[2021-11-03T07:31:54.617Z]         	            	actual  : "a"
[2021-11-03T07:31:54.617Z]         	            	
[2021-11-03T07:31:54.617Z]         	            	Diff:
[2021-11-03T07:31:54.617Z]         	            	--- Expected
[2021-11-03T07:31:54.617Z]         	            	+++ Actual
[2021-11-03T07:31:54.617Z]         	            	@@ -1 +1 @@
[2021-11-03T07:31:54.617Z]         	            	-a 
[2021-11-03T07:31:54.617Z]         	            	+a
[2021-11-03T07:31:54.617Z]         	Test:       	TestWeightString

@tiancaiamao
Copy link
Contributor

/run-check_dev

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 3, 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 Nov 3, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 4, 2021
@zhouqiang-cl
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 9fd3aab

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 4, 2021
@ti-chi-bot
Copy link
Member

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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 ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot merged commit 64319c0 into pingcap:release-5.3 Nov 4, 2021
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. 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.3-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants