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 data race and error handling in stats load (#31301) #31490

Merged
merged 6 commits into from
Jan 10, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jan 10, 2022

cherry-pick #31301 to release-5.4
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/31490

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

git push git@github.com:ti-srebot/tidb.git pr/31490:release-5.4-495525b262dd

What problem does this PR solve?

Issue Number: close #31237

Problem Summary:
This is targeted to fix the data race of writing & closing resultCh and incorrect error handling when paniked in finishWorking:
[2021-12-31T07:38:58.006Z] [2021/12/31 15:28:48.957 +08:00] [ERROR] [handle_hist.go:172] ["stats loading panicked"] [stack="goroutine 4028 [running]:\ngithub.com/pingcap/tidb/statistics/handle.(*Handle).handleOneTask.func1()\n\t/home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/statistics/handle/handle_hist.go:170 +0xa9\npanic(0x3c3f3c0, 0x4607ad0)\n\t/usr/local/go/src/runtime/panic.go:965 +0x1b9\ngithub.com/pingcap/tidb/statistics/handle.(*Handle).finishWorking(0xc02ec24b40, 0x3d, 0x4)\n\t/home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/statistics/handle/handle_hist.go:372 +0x106\ngithub.com/pingcap/tidb/statistics/handle.(*Handle).handleOneTask(0xc02ec24b40, 0xc04fd5df58, 0x7fc65c59dcf8, 0xc02e0df800, 0xc02d5310e0, 0x0, 0x0)\n\t/home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/statistics/handle/handle_hist.go:209 +0x6d4\ngithub.com/pingcap/tidb/statistics/handle.(*Handle).SubLoadWorker(0xc02ec24b40, 0x46f2848, 0xc02e0df800, 0xc02d5310e0, 0xc02e4a6488)\n\t/home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/statistics/handle/handle_hist.go:151 +0x125\ncreated by github.com/pingcap/tidb/domain.(*Domain).StartLoadStatsSubWorkers\n\t/home/jenkins/agent/workspace/tidb_ghpr_unit_test/go/src/github.com/pingcap/tidb/domain/domain.go:1305 +0x12b\n"]

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

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

ti-chi-bot commented Jan 10, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • AilinKid
  • hawkingrei

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 release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. 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 Jan 10, 2022
@ti-srebot ti-srebot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/5.4-cherry-pick labels Jan 10, 2022
@ti-srebot
Copy link
Contributor Author

@chrysan please accept the invitation then you can push to the cherry-pick pull requests. Comment with /cherry-pick-invite if the invitation is expired.
https://github.com/ti-srebot/tidb/invitations

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 10, 2022
@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 10, 2022
@hawkingrei
Copy link
Member

/run-mysql-test

@AilinKid
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 41db7bb

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 10, 2022
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Jan 10, 2022
@zhouqiang-cl
Copy link
Contributor

/merge

@zhouqiang-cl
Copy link
Contributor

/merge

@zhouqiang-cl
Copy link
Contributor

/merge

@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 a1718e0 into pingcap:release-5.4 Jan 10, 2022
@hawkingrei hawkingrei deleted the release-5.4-495525b262dd branch January 10, 2022 15:10
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-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 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.4-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants