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: make sure buildHashTable worker exits before IndexHashJoin finish (#31334) #31420

Merged
merged 3 commits into from
Jan 7, 2022

Conversation

ti-srebot
Copy link
Contributor

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

cherry-pick #31334 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/31420

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

git push git@github.com:ti-srebot/tidb.git pr/31420:release-5.4-40c0567ab398

What problem does this PR solve?

Issue Number: close #31062

Problem Summary:

What is changed and how it works?

Before this commit, buildHashTable worker may be still running while IndexHashJoin has finished already.
This commit makes the Close function wait for buildHashTable worker to exit to fix the problem.

Check List

Tests

Test

Side effects

N/A

Documentation

N/A

Release note

None

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

ti-chi-bot commented Jan 6, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • guo-shaoge
  • wshwsh12

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. release-note-none Denotes a PR that doesn't merit a release note. labels Jan 6, 2022
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot removed the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Jan 6, 2022
@ti-srebot ti-srebot added sig/execution SIG execution size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/5.4-cherry-pick type/bugfix This PR fixes a bug. labels Jan 6, 2022
@ti-srebot
Copy link
Contributor Author

@XuHuaiyu 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 7, 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 7, 2022
@VelocityLight VelocityLight added the cherry-pick-approved Cherry pick PR approved by release team. label Jan 7, 2022
@VelocityLight
Copy link

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: d3a70e7

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 7, 2022
@XuHuaiyu
Copy link
Contributor

XuHuaiyu commented Jan 7, 2022

/merge

@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 9fb7634 into pingcap:release-5.4 Jan 7, 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-none Denotes a PR that doesn't merit a release note. sig/execution SIG execution 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. type/bugfix This PR fixes a bug. type/5.4-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants