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 when getting snapshot ts in IndexLookupJoin and UnionExec (#30487) #31351

Merged
merged 3 commits into from
Apr 29, 2022

Conversation

ti-srebot
Copy link
Contributor

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

cherry-pick #30487 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/31351

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

git push git@github.com:ti-srebot/tidb.git pr/31351:release-5.4-daa17c448dbb

What problem does this PR solve?

Issue Number: close #30468

Problem Summary: When IndexLookUpJoin builds its inner executors, the building procedure may try to activate the transaction to get the snapshot ts concurrently, causing data race. If we activate the transaction before building inner executors, this problem can be avoided.

It's a quick fix and it's not very elegant since concurrent accessing to the transaction state still exists. I think we'd better to refactor the whole architecture of these executors and the transaction state, however it would be a tough work.

What is changed and how it works?

Check List

Tests

  • Integration test
  • Manual test (add detailed scripts or steps below)

Side effects

  • None

Documentation

  • None

Release note

Fix a data race that may cause "invalid transaction" error when executing a query using index lookup join.

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

ti-chi-bot commented Jan 5, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • cfzjywxk
  • tiancaiamao

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 do-not-merge/cherry-pick-not-approved 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 5, 2022
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. 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 5, 2022
@ti-srebot ti-srebot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.4-cherry-pick labels Jan 5, 2022
@ti-srebot
Copy link
Contributor Author

@MyonKeminta you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 5, 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
@VelocityLight VelocityLight added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 27, 2022
@tiancaiamao
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: ab9703f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 29, 2022
@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.

@sre-bot
Copy link
Contributor

sre-bot commented Apr 29, 2022

@ti-chi-bot ti-chi-bot merged commit c679590 into pingcap:release-5.4 Apr 29, 2022
@tiancaiamao tiancaiamao deleted the release-5.4-daa17c448dbb branch April 29, 2022 03:41
@purelind purelind added this to the v5.4.1 milestone Apr 29, 2022
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 Denotes a PR that will be considered when it comes time to generate release notes. 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. type/5.4-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants