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

Merged
merged 4 commits into from Jul 13, 2023
Merged

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

merged 4 commits into from Jul 13, 2023

Conversation

xzhangxian1008
Copy link
Contributor

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

@ti-chi-bot ti-chi-bot bot added release-note-none do-not-merge/needs-triage-completed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 11, 2023
@tiprow
Copy link

tiprow bot commented Jul 11, 2023

Hi @xzhangxian1008. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

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.

@hawkingrei
Copy link
Member

/retest

@hawkingrei
Copy link
Member

/ok-to-test

@xzhangxian1008
Copy link
Contributor Author

/cc @XuHuaiyu

@ti-chi-bot ti-chi-bot bot requested a review from XuHuaiyu July 12, 2023 02:07
@xzhangxian1008 xzhangxian1008 changed the title executor: fix query hang in IndexMerge Executor when it's kill executor: fix query hang in IndexMerge Executor when it's killed Jul 12, 2023
@xzhangxian1008
Copy link
Contributor Author

/hold

@ti-chi-bot ti-chi-bot bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 12, 2023
@xzhangxian1008
Copy link
Contributor Author

/cc @guo-shaoge @XuHuaiyu

@ti-chi-bot ti-chi-bot bot requested review from guo-shaoge and XuHuaiyu July 12, 2023 08:18
@xzhangxian1008
Copy link
Contributor Author

/unhold

@ti-chi-bot ti-chi-bot bot added needs-cherry-pick-release-5.4 Type: Need cherry pick to release-5.4 needs-cherry-pick-release-6.1 needs-cherry-pick-release-6.5 and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. do-not-merge/needs-triage-completed labels Jul 13, 2023
windtalker
windtalker approved these changes Jul 13, 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
Copy link

ti-chi-bot bot commented Jul 13, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: guo-shaoge, windtalker

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 [guo-shaoge,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
Copy link

ti-chi-bot bot commented Jul 13, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-07-13 02:09:37.885910598 +0000 UTC m=+557069.656249338: ☑️ agreed by guo-shaoge.
  • 2023-07-13 02:49:44.878216598 +0000 UTC m=+559476.648555311: ☑️ agreed by windtalker.

@xzhangxian1008
Copy link
Contributor Author

/retest

@ti-chi-bot ti-chi-bot bot merged commit d4500b8 into pingcap:master Jul 13, 2023
9 checks passed
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #45342.

@ti-chi-bot ti-chi-bot mentioned this pull request Jul 13, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.1: #45343.

@ti-chi-bot ti-chi-bot mentioned this pull request Jul 13, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-5.4: #45344.

@ti-chi-bot ti-chi-bot mentioned this pull request Jul 13, 2023
Open
12 tasks
ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jul 13, 2023
@xzhangxian1008 @ti-chi-bot
This is an automated cherry-pick of pingcap#45284
42c4f5d 
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
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.1: #45345.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jul 13, 2023
@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>
xzhangxian1008 added a commit to xzhangxian1008/tidb that referenced this pull request Jul 13, 2023
@xzhangxian1008
executor: fix query hang in IndexMerge Executor when it's killed (pin…
84b1413 
…gcap#45284)

close pingcap#45279
ti-chi-bot bot pushed a commit that referenced this pull request Jul 13, 2023
@ti-chi-bot
executor: fix query hang in IndexMerge Executor when it's killed (#45284
8e01f6e 
) (#45343)

close #45279
ti-chi-bot bot pushed a commit that referenced this pull request Jul 13, 2023
@xzhangxian1008
executor: fix query hang in IndexMerge Executor when it's killed (#45284
96ede0b 
) (#45346)
@windtalker windtalker mentioned this pull request Aug 3, 2023
Merged
16 tasks
dbsid pushed a commit to qw4990/tidb that referenced this pull request Aug 8, 2023
@xzhangxian1008 @dbsid
executor: fix query hang in IndexMerge Executor when it's killed (pin…
53af3ef 
…gcap#45284)

close pingcap#45279
jackysp pushed a commit to jackysp/tidb that referenced this pull request Aug 8, 2023
@xzhangxian1008 @jackysp
executor: fix query hang in IndexMerge Executor when it's killed (pin…
be110f9 
…gcap#45284)

close pingcap#45279
ti-chi-bot bot pushed a commit that referenced this pull request Aug 9, 2023
@ti-chi-bot
executor: fix query hang in IndexMerge Executor when it's killed (#45284
ced7a37 
) (#45342)

close #45279
ti-chi-bot bot pushed a commit that referenced this pull request Mar 11, 2024
@ti-chi-bot
executor: fix query hang in IndexMerge Executor when it's killed (#45284
b9fe0a2 
) (#45345)

close #45279
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
@windtalker windtalker mentioned this pull request Mar 12, 2024
Merged
13 tasks
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

@windtalker windtalker windtalker approved these changes

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

@XuHuaiyu XuHuaiyu Awaiting requested review from XuHuaiyu

Assignees
No one assigned
Labels
approved lgtm needs-cherry-pick-release-5.4 Type: Need cherry pick to release-5.4 needs-cherry-pick-release-6.1 needs-cherry-pick-release-6.5 needs-cherry-pick-release-7.1 ok-to-test release-note-none size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

The query may hang in IndexMerge executor when it's killed
6 participants
@xzhangxian1008 @hawkingrei @ti-chi-bot @windtalker @guo-shaoge @XuHuaiyu