Skip to content

executor: Fix tidb crash on index merge reader (#40904)#40981

Merged
ti-chi-bot merged 4 commits intopingcap:release-6.1from
ti-chi-bot:cherry-pick-40904-to-release-6.1
Mar 28, 2023
Merged

executor: Fix tidb crash on index merge reader (#40904)#40981
ti-chi-bot merged 4 commits intopingcap:release-6.1from
ti-chi-bot:cherry-pick-40904-to-release-6.1

Conversation

@ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Feb 2, 2023

This is an automated cherry-pick of #40904

What problem does this PR solve?

Issue Number: close #40877

Problem Summary:

What is changed and how it works?

Let both pickAndExecTask and handlePickAndExecTaskPanic take the address of task as its argument, so once *task is assigned in pickAndExecTask, handlePickAndExecTaskPanic will get a non nil value.

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

Please refer to Release Notes Language Style Guide to write a quality release note.

None

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

ti-chi-bot commented Feb 2, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • guo-shaoge
  • 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.

Details

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 force-pushed the cherry-pick-40904-to-release-6.1 branch from e1d159c to c346e22 Compare February 2, 2023 07:14
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 2, 2023
Merged
12 tasks
@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/cherry-pick-not-approved size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR. labels Feb 2, 2023
@windtalker
Copy link
Contributor

windtalker commented Feb 9, 2023

Close as major bug is not needed the cherry pick unless there is a customer waiting this.

@windtalker windtalker closed this Feb 9, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Mar 24, 2023
@windtalker windtalker reopened this Mar 24, 2023
windtalker
windtalker approved these changes Mar 24, 2023
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 the status/LGT1 Indicates that a PR has LGTM 1. label Mar 24, 2023
@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 Mar 27, 2023
@guo-shaoge
Copy link
Collaborator

guo-shaoge commented Mar 27, 2023

/merge

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Mar 27, 2023

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

DetailsCommit hash: 3ad112f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 27, 2023
@windtalker
Copy link
Contributor

windtalker commented Mar 27, 2023

/test unit-test

@windtalker
Copy link
Contributor

windtalker commented Mar 27, 2023

/test check-dev

@windtalker
fix build
41d1b1a 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Mar 28, 2023
@windtalker
Copy link
Contributor

windtalker commented Mar 28, 2023

/merge

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Mar 28, 2023

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

DetailsCommit hash: 41d1b1a

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 28, 2023
@windtalker
fix ci
3a8ee85 
Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Mar 28, 2023
@windtalker
Copy link
Contributor

windtalker commented Mar 28, 2023

/merge

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Mar 28, 2023

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

DetailsCommit hash: 3a8ee85

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 28, 2023
@windtalker
Copy link
Contributor

windtalker commented Mar 28, 2023

/test check-dev

@ti-chi-bot ti-chi-bot merged commit 6c1e555 into pingcap:release-6.1 Mar 28, 2023
@VelocityLight VelocityLight added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 12, 2023
@ti-chi-bot ti-chi-bot deleted the cherry-pick-40904-to-release-6.1 branch April 15, 2025 08:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@windtalker windtalker windtalker approved these changes

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

Assignees

@windtalker windtalker

Labels

cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. 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/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ti-chi-bot @windtalker @guo-shaoge @VelocityLight