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

executor: fix data race of parallel apply operator (#24257) #24345

Merged
merged 2 commits into from
Jun 18, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Apr 28, 2021

cherry-pick #24257 to release-5.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/24345

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

git push git@github.com:ti-srebot/tidb.git pr/24345:release-5.0-f07b62fcdfc0

What problem does this PR solve?

Issue Number: close #23280

Problem Summary: TestApplyGoroutinePanic test the situation of inner work panics. Sometime we got data race error. That's because:

  1. Apply operator initializes, outer worker(TableReaderExecutor) starts.
  2. Apply's Close() method is called by this case.
  3. outExec.Close() is called.
  4. Notify outer worker to finish.

Feedback info will be read in step 3. But before step 4 really works, outer worker still runs normally, it will write Feedbackinfo.

So we got data race. (Only happens on feedback, it's disabled by default.)

What is changed and how it works?

What's Changed: In Apply's Close() method, we first notify outer worker to finish and wait untill it's really finished. Then we call outer exec's Close() method.

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests: difficult to reproduce.

Side effects: no

Release note

  • executor: fix data race of parallel apply operator

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot requested a review from a team as a code owner April 28, 2021 07:10
@ti-srebot ti-srebot requested review from lzmhhh123 and removed request for a team April 28, 2021 07:10
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added sig/execution SIG execution sig/sql-infra SIG: SQL Infra size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/5.0-cherry-pick type/bugfix This PR fixes a bug. labels Apr 28, 2021
@ti-srebot ti-srebot added this to the v5.0.1 milestone Apr 28, 2021
@ti-srebot
Copy link
Contributor Author

@guo-shaoge you're already a collaborator in bot's repo.

@xhebox
Copy link
Contributor

xhebox commented Apr 28, 2021

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 28, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lzmhhh123
  • xhebox

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 Apr 28, 2021
@wshwsh12 wshwsh12 removed their request for review June 3, 2021 05:07
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Jun 4, 2021
@guo-shaoge guo-shaoge removed the request for review from XuHuaiyu June 11, 2021 02:34
@xhebox
Copy link
Contributor

xhebox commented Jun 18, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: cc80524

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 18, 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 merged commit 2c4be62 into pingcap:release-5.0 Jun 18, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v5.0.1, v5.0.3 Jun 28, 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. sig/execution SIG execution sig/sql-infra SIG: SQL Infra 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. type/5.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants