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

executor: fix query hang in IndexMerge Executor when it's killed (#45284) #45345

Merged
merged 4 commits into from
Mar 11, 2024
Merged

executor: fix query hang in IndexMerge Executor when it's killed (#45284) #45345

merged 4 commits into from
Mar 11, 2024

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #45284

What problem does this PR solve?

Issue Number: close #45279

Problem Summary:

What is changed and how it works?

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

@xzhangxian1008 @ti-chi-bot
This is an automated cherry-pick of pingcap#45284
982e35c 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Jul 13, 2023
Merged
12 tasks
@ti-chi-bot ti-chi-bot added ok-to-test Indicates a PR is ready to be tested. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 13, 2023
@ti-chi-bot ti-chi-bot bot added the release-note-none Denotes a PR that doesn't merit a release note. label Jul 13, 2023
@ti-chi-bot ti-chi-bot added the type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR. label Jul 13, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Jul 13, 2023

This cherry pick PR is for a release branch and has not yet been approved by release team.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, it must first be approved by the collaborators.

AFTER it has been approved by collaborators, please ping the release team in a comment to request a cherry pick review.

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 kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Mar 7, 2024
xzhangxian1008
xzhangxian1008 approved these changes Mar 7, 2024
View reviewed changes
Copy link
Contributor

@xzhangxian1008 xzhangxian1008 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
Copy link

ti-chi-bot bot commented Mar 7, 2024

@xzhangxian1008: adding LGTM is restricted to approvers and reviewers in OWNERS files.

In response to this:

LGTM

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 kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 8, 2024
@xzhangxian1008
Copy link
Contributor

/retest

1 similar comment
@xzhangxian1008
Copy link
Contributor

/retest

windtalker
windtalker approved these changes Mar 8, 2024
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 bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Mar 8, 2024
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Mar 11, 2024
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Mar 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: windtalker, XuHuaiyu, xzhangxian1008

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [XuHuaiyu,windtalker]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Mar 11, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-03-08 09:48:44.999442522 +0000 UTC m=+419752.021688909: ☑️ agreed by windtalker.
  • 2024-03-11 02:19:04.676963402 +0000 UTC m=+651971.699209790: ☑️ agreed by XuHuaiyu.

@ti-chi-bot ti-chi-bot bot merged commit b9fe0a2 into pingcap:release-6.1 Mar 11, 2024
7 checks passed
@xzhangxian1008 xzhangxian1008 deleted the cherry-pick-45284-to-release-6.1 branch March 11, 2024 08:57
windtalker pushed a commit to windtalker/tidb that referenced this pull request Mar 12, 2024
@ti-chi-bot @windtalker
executor: fix query hang in IndexMerge Executor when it's killed (pin…
9797ccb 
…gcap#45284) (pingcap#45345)

close pingcap#45279
ti-chi-bot bot pushed a commit that referenced this pull request Mar 12, 2024
@windtalker
executor: fix query hang in IndexMerge Executor when it's killed (#45284
fd44473 
) (#45345) (#51677)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xzhangxian1008 xzhangxian1008 xzhangxian1008 approved these changes

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

@windtalker windtalker windtalker approved these changes

Assignees

@xzhangxian1008 xzhangxian1008

Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm ok-to-test Indicates a PR is ready to be tested. 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. 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 @xzhangxian1008 @windtalker @XuHuaiyu