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

*: fix data race in the SessionVars.InRestrictedSQL #30920

Closed
wants to merge 2 commits into from
Closed

*: fix data race in the SessionVars.InRestrictedSQL #30920

wants to merge 2 commits into from

Conversation

hawkingrei
Copy link
Member

@hawkingrei hawkingrei commented Dec 21, 2021 •
edited
Loading

Signed-off-by: Weizhen Wang wangweizhen@pingcap.com

What problem does this PR solve?

Issue Number: close #30918

Problem Summary:

What is changed and how it works?

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

None

@ti-chi-bot
Copy link
Member

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Defined2014
  • xhebox

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/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 21, 2021
@hawkingrei hawkingrei force-pushed the fix_data_race_in_the_inrestrictedsql branch from 294e488 to 8590393 Compare December 21, 2021 12:10
@sre-bot
Copy link
Contributor

sre-bot commented Dec 21, 2021 •
edited
Loading

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

@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 21, 2021
@hawkingrei
Copy link
Member Author

/run-all-tests

@hawkingrei hawkingrei force-pushed the fix_data_race_in_the_inrestrictedsql branch from d2f2bdc to 9d741e6 Compare December 21, 2021 16:11
@hawkingrei hawkingrei added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 21, 2021
@hawkingrei hawkingrei changed the title *: fix data race in the SessionVars.InRestrictedSQL [WIP] *: fix data race in the SessionVars.InRestrictedSQL Dec 21, 2021
@hawkingrei hawkingrei force-pushed the fix_data_race_in_the_inrestrictedsql branch from 9d741e6 to b0e6be8 Compare December 22, 2021 01:51
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 22, 2021
@hawkingrei hawkingrei changed the title [WIP] *: fix data race in the SessionVars.InRestrictedSQL *: fix data race in the SessionVars.InRestrictedSQL Dec 22, 2021
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 22, 2021
@hawkingrei hawkingrei force-pushed the fix_data_race_in_the_inrestrictedsql branch 2 times, most recently from f1e48c0 to 52a6bc4 Compare December 22, 2021 01:56
@hawkingrei
Copy link
Member Author

/run-unit-test

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 22, 2021
wjhuang2016
wjhuang2016 reviewed Dec 22, 2021
View reviewed changes
session/session.go Outdated
@@ -1528,12 +1528,7 @@ func (s *session) ParseWithParams(ctx context.Context, sql string, args ...inter

// ParseWithParamsInternal is same as ParseWithParams except set `s.sessionVars.InRestrictedSQL = true`
Copy link
Member

Choose a reason for hiding this comment

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

Wrong comment and function name.

Copy link
Member Author

Choose a reason for hiding this comment

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

Remove all ParseWithParamsInternal.

@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 22, 2021
@hawkingrei
Copy link
Member Author

/run-check_dev_2

@hawkingrei hawkingrei force-pushed the fix_data_race_in_the_inrestrictedsql branch from 303d8a3 to 372c501 Compare December 22, 2021 05:25
@hawkingrei
Copy link
Member Author

refactor #30843

wjhuang2016
wjhuang2016 reviewed Dec 22, 2021
View reviewed changes
session/session.go Outdated Show resolved Hide resolved
@hawkingrei
*: fix data race in the SessionVars.InRestrictedSQL
1781b4e 
Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
@hawkingrei hawkingrei force-pushed the fix_data_race_in_the_inrestrictedsql branch 2 times, most recently from 0d48491 to 68fc1d9 Compare December 22, 2021 10:39
@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 22, 2021
@xhebox
Copy link
Contributor

xhebox commented Dec 22, 2021

/merge

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

xhebox commented Dec 22, 2021

/merge cancel

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Dec 22, 2021
@hawkingrei
*: remove ParseWithParamsInternal
d398e3d 
Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
@hawkingrei hawkingrei force-pushed the fix_data_race_in_the_inrestrictedsql branch from 68fc1d9 to d398e3d Compare December 22, 2021 11:03
@xhebox
Copy link
Contributor

xhebox commented Dec 22, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: d398e3d

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

@hawkingrei: 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.

@wjhuang2016
Copy link
Member

/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 22, 2021
@hawkingrei hawkingrei force-pushed the fix_data_race_in_the_inrestrictedsql branch from c34b1d5 to d398e3d Compare December 22, 2021 12:50
@hawkingrei hawkingrei closed this Dec 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Defined2014 Defined2014 Defined2014 approved these changes

@wjhuang2016 wjhuang2016 wjhuang2016 left review comments

@xhebox xhebox xhebox approved these changes

Assignees
No one assigned
Labels
do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 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.

DATA RACE in the SessionVars.InRestrictedSQL
6 participants
@hawkingrei @ti-chi-bot @sre-bot @xhebox @wjhuang2016 @Defined2014