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 in the IndexNestedLoopHashJoin #31731

Merged
merged 5 commits into from
Jan 17, 2022
Merged

executor: fix data race in the IndexNestedLoopHashJoin #31731

merged 5 commits into from
Jan 17, 2022

Conversation

wshwsh12
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #31467

Problem Summary:
Enable failpoint and test race for the test TestIssue31129, it will failed.

What is changed and how it works?

handleTask will handle the error when keepOuterOrder is true.
We shouldn't handle it again.

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

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jan 17, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • 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-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 17, 2022
@XuHuaiyu XuHuaiyu added the type/bugfix This PR fixes a bug. label Jan 17, 2022
XuHuaiyu
XuHuaiyu approved these changes Jan 17, 2022
View reviewed changes
Copy link
Contributor

@XuHuaiyu XuHuaiyu 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-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 17, 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 17, 2022
@guo-shaoge
Copy link
Collaborator

/merge

@ti-chi-bot
Copy link
Member

@guo-shaoge: /merge is only allowed for the committers, you can assign this pull request to the committer in list by filling /assign @committer in the comment to help merge this pull request.

In response to this:

/merge

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.

@sre-bot
Copy link
Contributor

sre-bot commented Jan 17, 2022

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

@wshwsh12
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 12893a1

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 17, 2022
@ti-chi-bot ti-chi-bot merged commit ca7ff0a into pingcap:master Jan 17, 2022
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jan 17, 2022
@wshwsh12 @ti-srebot
cherry pick pingcap#31731 to release-5.0
71731e5 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Jan 17, 2022
Closed
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #31753

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jan 17, 2022
@wshwsh12 @ti-srebot
cherry pick pingcap#31731 to release-5.1
5eb9503 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Jan 17, 2022
Closed
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.1 in PR #31754

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jan 17, 2022
@wshwsh12 @ti-srebot
cherry pick pingcap#31731 to release-5.2
525be3d 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Jan 17, 2022
Closed
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.2 in PR #31755

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jan 17, 2022
@wshwsh12 @ti-srebot
cherry pick pingcap#31731 to release-5.3
f2f9643 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Jan 17, 2022
Closed
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.3 in PR #31756

@ti-srebot ti-srebot mentioned this pull request Jan 17, 2022
Merged
12 tasks
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jan 17, 2022
@wshwsh12 @ti-srebot
cherry pick pingcap#31731 to release-5.4
29b0597 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.4 in PR #31757

@Startrekzky Startrekzky mentioned this pull request Feb 21, 2022
Closed
XuHuaiyu added a commit to ti-srebot/tidb that referenced this pull request Feb 22, 2022
@XuHuaiyu
cherry-pick pingcap#31731 to release-5.3
25d5976
ti-chi-bot pushed a commit that referenced this pull request Apr 27, 2022
@ti-srebot
executor: fix data race in the IndexNestedLoopHashJoin (#31731) (#31757)
fa1db5c 
close #31467
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hawkingrei hawkingrei hawkingrei approved these changes

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

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-5.0 needs-cherry-pick-release-5.1 needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. release-note-none Denotes a PR that doesn't merit a release note. 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/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

DATA RACE in the IndexNestedLoopHashJoin
7 participants
@wshwsh12 @ti-chi-bot @guo-shaoge @sre-bot @ti-srebot @hawkingrei @XuHuaiyu