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

statistics: fix panic occurs when stats cache inconsistency (#22465) #22565

Merged
merged 4 commits into from
May 12, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jan 27, 2021

cherry-pick #22465 to release-4.0
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/22565

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

git push git@github.com:ti-srebot/tidb.git pr/22565:release-4.0-f22ec62dd03f

What problem does this PR solve?

Issue Number: close #22464

Problem Summary:

  1. panic occurs when stats cache inconsistency.
  2. lock leak of loadStatsWorker which can make stats cache inconsistency.
    this problem solved by statistics: fix an unsafe lock operation and adjust some logging levels #20381

What is changed and how it works?

What's Changed:

  1. make a check when calling mathutil.MaxInt64(ndv, col.NDV)

How it Works:

  1. check key if exits in col map to avoid calling nil pointer

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
    No need.
  • Need to cherry-pick to the release branch
    4.0.8 or above

Check List

Tests

  • Unit test
    pass
  • Integration test
    pass
  • Manual test (add detailed scripts or steps below)
    pass
  • No code

Side effects

  • Performance regression
    may be little cpu cost
  • Breaking backward compatibility

Release note

  • Fix panic occurs when stats inconsistency

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot you're already a collaborator in bot's repo.

Copy link
Contributor

@eurekaka eurekaka left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 27, 2021
@eurekaka
Copy link
Contributor

/run-all-tests

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • winoros

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@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 May 11, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label May 11, 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: 7a36064

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 12, 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 added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 12, 2021
@zhouqiang-cl
Copy link
Contributor

/run-unit-tests

@ti-chi-bot ti-chi-bot merged commit 899991e into pingcap:release-4.0 May 12, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v4.0.11, v4.0.13 May 17, 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. component/statistics contribution This PR is from a community contributor. size/XS Denotes a PR that changes 0-9 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/4.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants