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

executor: fix data race on the IndexMergeReaderExecutor #39513

Merged
merged 5 commits into from
Dec 1, 2022
Merged

executor: fix data race on the IndexMergeReaderExecutor #39513

merged 5 commits into from
Dec 1, 2022

Conversation

hawkingrei
Copy link
Member

@hawkingrei hawkingrei commented Nov 30, 2022 •
edited
Loading

Signed-off-by: Weizhen Wang [email protected]

What problem does this PR solve?

Issue Number: close #39514

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

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 30, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • guo-shaoge
  • 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 Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. do-not-merge/needs-triage-completed labels Nov 30, 2022
@hawkingrei
Copy link
Member Author

/check-issue-triage-complete

qw4990
qw4990 reviewed Dec 1, 2022
View reviewed changes
executor/index_merge_reader.go Outdated
return nil, err
}
e.tableRequestMu.Unlock()
Copy link
Contributor

Choose a reason for hiding this comment

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

Wrapping these lines as a dedicated function seems safer and more go-style:

(e *IndexMergeReaderExecutor) constructDistExec() {
    e.Lock()
    defer e.Unlock()
    constructDistExec(e.ctx, e.tblPlans)
}

Copy link
Member Author

Choose a reason for hiding this comment

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

Have fixed.

@hawkingrei hawkingrei force-pushed the fix_data_race_in_the_index branch from c365e08 to 76e8887 Compare December 1, 2022 06:46
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 1, 2022
guo-shaoge
guo-shaoge reviewed Dec 1, 2022
View reviewed changes
executor/index_merge_reader.go Outdated
err = func() error {
e.tableRequestMu.Lock()
defer e.tableRequestMu.Unlock()
tableReaderExec.dagPB.Executors, err = constructDistExec(e.ctx, e.tblPlans)
Copy link
Collaborator

@guo-shaoge guo-shaoge Dec 1, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Maybe we can construct DistExec in IndexMergeExec.Open(), so no need to use lock?

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

@hawkingrei
update
5d3943c 
Signed-off-by: Weizhen Wang <[email protected]>
@hawkingrei
update
3e3897f 
Signed-off-by: Weizhen Wang <[email protected]>
@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 1, 2022
@hawkingrei
Copy link
Member Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 3e3897f

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

/run-check-dev

@ti-chi-bot ti-chi-bot merged commit d354d8d into pingcap:master Dec 1, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Dec 1, 2022

TiDB MergeCI notify

🔴 Bad News! New failing [1] after this pr merged.
These new failed integration tests seem to be caused by the current PR, please try to fix these new failed integration tests, thanks!

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/integration-common-test 🟥 failed 1, success 16, total 17 25 min New failing
idc-jenkins-ci/integration-cdc-test 🔴 failed 1, success 39, total 40 24 min Existing failure
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 10 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 5 min 55 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 5 min 45 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 26 sec Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 4 min 44 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 54 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 2 min 51 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@qw4990 qw4990 qw4990 approved these changes

@guo-shaoge guo-shaoge guo-shaoge approved these changes

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 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 buildFinalTableReader
5 participants
@hawkingrei @ti-chi-bot @sre-bot @guo-shaoge @qw4990