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

fix a panic issue in parallel agg when exception is thrown (#5433) #5443

Merged
merged 2 commits into from
Jul 21, 2022
Merged

fix a panic issue in parallel agg when exception is thrown (#5433) #5443

merged 2 commits into from
Jul 21, 2022

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #5433

Signed-off-by: gengliqi gengliqiii@gmail.com

What problem does this PR solve?

Issue Number: close #5356

Problem Summary:
See #5356.

What is changed and how it works?

See #5356 (comment).
Although the panic doesn't happen by lucky coincidence due to #5274, this PR is still needed for previous branches.
It's easier to pick this PR to other branches than #5274.

The ParallelAggregatingBlockInputStream should be canceled when its processors meet an exception.
Otherwise, the aggregation of non-joined data will still process which leads to panic like #5356 shows.

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

Fix a panic issue in parallel aggregation when an exception is thrown.

@gengliqi @ti-chi-bot
This is an automated cherry-pick of pingcap#5433
9c5ac0b 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Jul 21, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • gengliqi
  • windtalker

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 release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jul 21, 2022
@ti-chi-bot ti-chi-bot mentioned this pull request Jul 21, 2022
Merged
12 tasks
@ti-chi-bot ti-chi-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-5.3 labels Jul 21, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jul 21, 2022
@gengliqi
fix conflict
1b7d589 
Signed-off-by: gengliqi <gengliqiii@gmail.com>
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 21, 2022
windtalker
windtalker approved these changes Jul 21, 2022
View reviewed changes
Copy link
Contributor

@windtalker windtalker 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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 21, 2022
@gengliqi
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

@gengliqi: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and 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.

If you have any questions about the PR merge process, please refer to pr process.

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
Copy link
Member Author

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

Commit hash: 1b7d589

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 21, 2022
@sre-bot
Copy link
Collaborator

sre-bot commented Jul 21, 2022

lines: 36.2% (43328 out of 119733)
branches: 5.4% (66627 out of 1223900)

@ti-chi-bot ti-chi-bot merged commit 2b4fa17 into pingcap:release-5.3 Jul 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SeaRise SeaRise SeaRise approved these changes

@gengliqi gengliqi gengliqi approved these changes

@windtalker windtalker windtalker approved these changes

Assignees

@gengliqi gengliqi

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/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/cherry-pick-for-release-5.3
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-chi-bot @gengliqi @sre-bot @windtalker @SeaRise @VelocityLight