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

sessionctx: make builtinFunctionUsage thread safe #33032

Merged
merged 3 commits into from
Mar 16, 2022
Merged

sessionctx: make builtinFunctionUsage thread safe #33032

merged 3 commits into from
Mar 16, 2022

Conversation

Yisaer
Copy link
Contributor

@Yisaer Yisaer commented Mar 14, 2022 •
edited

Signed-off-by: yisaer disxiaofei@163.com

What problem does this PR solve?

Issue Number: close #33027

Problem Summary:

What is changed and how it works?

make builtinFunctionUsage thread safe

Check List

Tests

  • manual test

We run the workload which can reproduced the issue with this tidb branch for about hours, the concurrent write error disappeared as expected.

Release note

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 14, 2022 •
edited

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • mjonss
  • qw4990

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 size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 14, 2022
@Yisaer Yisaer marked this pull request as draft March 14, 2022 06:48
@ti-chi-bot ti-chi-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 14, 2022
@Yisaer
add mutex
5d72b8c 
Signed-off-by: yisaer <disxiaofei@163.com>

add mutex

Signed-off-by: yisaer <disxiaofei@163.com>

add mutex

Signed-off-by: yisaer <disxiaofei@163.com>

add mutex

Signed-off-by: yisaer <disxiaofei@163.com>
@Yisaer Yisaer force-pushed the sync_BuiltinFunctionsUsage branch from 2c98234 to 5d72b8c Compare March 14, 2022 07:02
ngaut
ngaut reviewed Mar 14, 2022
View reviewed changes
session/session.go Outdated
return s.builtinFunctionUsage
s.functionUsageMu.RLock()
defer s.functionUsageMu.RUnlock()
replica := make(map[string]uint32)
Copy link
Member

Choose a reason for hiding this comment

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

please remove map creation out of the lock scope.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated.

@Yisaer
address the comment
f1e406f 
Signed-off-by: yisaer <disxiaofei@163.com>
@Yisaer Yisaer requested a review from qw4990 March 15, 2022 09:16
@Yisaer Yisaer marked this pull request as ready for review March 15, 2022 09:17
@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 Mar 15, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Mar 15, 2022 •
edited

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

qw4990
qw4990 reviewed Mar 15, 2022
View reviewed changes
Copy link
Contributor

@qw4990 qw4990 left a comment

Choose a reason for hiding this comment

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

LGTM, but is there any way to add some tests for it? @Yisaer

mjonss
mjonss approved these changes Mar 15, 2022
View reviewed changes
Copy link
Contributor

@mjonss mjonss left a comment

Choose a reason for hiding this comment

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

LGTM

Can a test be added as well?

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 15, 2022
@Yisaer
Copy link
Contributor Author

Yisaer commented Mar 16, 2022

I'm afraid it's hard to add a unit test for this issue. However, we have already manually re-run the workload which previously exposed the concurrent write bug for hours with this tidb branch in our internal intergration test, the result is fine as expected. @qw4990 @mjonss

@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 Mar 16, 2022
@qw4990
Copy link
Contributor

qw4990 commented Mar 16, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: f1e406f

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

@Yisaer: 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 2ae7132 into pingcap:master Mar 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ngaut ngaut ngaut left review comments

@mjonss mjonss mjonss approved these changes

@qw4990 qw4990 qw4990 approved these changes

Assignees
No one assigned
Labels
release-note-none 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

concurrent map writes
6 participants
@Yisaer @ti-chi-bot @sre-bot @qw4990 @ngaut @mjonss