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 sysvar inconsistencies/potential bugs #24964

Merged
merged 7 commits into from
Jun 1, 2021

Conversation

morgo
Copy link
Contributor

@morgo morgo commented May 28, 2021

What problem does this PR solve?

Problem Summary:

This fixes two inconsistencies/potential bugs with sysvars:

  1. There are a number of Int/Unsigned sysvars that have a range which includes a MaxValue greater than the internal value which stores the setting, for example:
	{Scope: ScopeGlobal | ScopeSession, Name: TiDBExecutorConcurrency, Value: strconv.Itoa(DefExecutorConcurrency), Type: TypeUnsigned, MinValue: 1, MaxValue: math.MaxUint64, SetSession: func(s *SessionVars, val string) error {	{Scope: ScopeGlobal | ScopeSession, Name: TiDBExecutorConcurrency, Value: strconv.Itoa(DefExecutorConcurrency), Type: TypeUnsigned, MinValue: 1, MaxValue: math.MaxInt32, SetSession: func(s *SessionVars, val string) error {
		s.ExecutorConcurrency = tidbOptPositiveInt32(val, DefExecutorConcurrency)
		return nil
	}},

Math.Uint64 is much greater than tidbOptPositiveInt32. The precision is lost when setting the value, not in the validation function.. which makes this behavior undefined.

  1. There are a number of variables which are inconsistently named using "TIDB" (all upper), when the convention is "TiDB". Since this is just the constant name, and doesn't change the storage name, it's safe to rename them.

What is changed and how it works?

Minor code fixes.

Related changes

-None

Check List

Tests

  • Unit test (covered by existing tests)

Side effects

-None

Release note

  • No release note

@morgo morgo added the sig/sql-infra SIG: SQL Infra label May 28, 2021
@ti-chi-bot ti-chi-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 28, 2021
@morgo
Copy link
Contributor Author

morgo commented May 28, 2021

/run-check_dev_2

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 31, 2021
@morgo morgo requested a review from a team May 31, 2021 16:26
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • wjhuang2016
  • 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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jun 1, 2021
@xhebox
Copy link
Contributor

xhebox commented Jun 1, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 0664c0f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 1, 2021
@morgo
Copy link
Contributor Author

morgo commented Jun 1, 2021

/run-check_dev_2

@ti-chi-bot
Copy link
Member

@morgo: 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 8dc2119 into pingcap:master Jun 1, 2021
@morgo morgo deleted the fix-sysvar-inconsistencies branch June 1, 2021 03:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sig/sql-infra SIG: SQL Infra 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
Development

Successfully merging this pull request may close these issues.

4 participants