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 index_hash_join hang when context canceled #54855

Merged
merged 4 commits into from
Jul 26, 2024
Merged

executor: fix index_hash_join hang when context canceled #54855

merged 4 commits into from
Jul 26, 2024

Conversation

wshwsh12
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #54688

Problem Summary:

What changed and how does it work?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

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.

Fix the issue that index_hash_join could not exit properly when SQL was interrupted abnormally.

@ti-chi-bot ti-chi-bot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/needs-triage-completed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 24, 2024
@tiprow tiprow
Copy link

tiprow bot commented Jul 24, 2024

Hi @wshwsh12. 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-sigs/prow repository.

@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jul 24, 2024
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Jul 24, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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,guo-shaoge]

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 bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jul 24, 2024
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Jul 24, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-07-24 03:50:47.518567299 +0000 UTC m=+1017069.509508771: ☑️ agreed by XuHuaiyu.
  • 2024-07-24 03:53:15.59143093 +0000 UTC m=+1017217.582372401: ☑️ agreed by guo-shaoge.

@codecov Codecov
Copy link

codecov bot commented Jul 24, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 58.3887%. Comparing base (d0c73aa) to head (af8d05f).
Report is 27 commits behind head on master.

Additional details and impacted files 
@@                Coverage Diff                @@
##             master     #54855         +/-   ##
=================================================
- Coverage   74.8856%   58.3887%   -16.4970%     
=================================================
  Files          1557       1682        +125     
  Lines        363605     631557     +267952     
=================================================
+ Hits         272288     368758      +96470     
- Misses        71687     239061     +167374     
- Partials      19630      23738       +4108
Flag Coverage Δ
integration 40.4565% <25.0000%> (?)
unit 73.3240% <100.0000%> (-0.4865%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 52.9656% <ø> (-2.2339%) ⬇️
parser ∅ <ø> (∅)
br 62.9612% <ø> (+15.2467%) ⬆️

@hawkingrei
Copy link
Member

/ok-to-test

@ti-chi-bot ti-chi-bot bot added the ok-to-test Indicates a PR is ready to be tested. label Jul 24, 2024
@wshwsh12
Copy link
Contributor Author

/retest

@wshwsh12 wshwsh12 changed the title executor: index_hash_join hang when context canceled executor: fix index_hash_join hang when context canceled Jul 24, 2024
@wshwsh12
Copy link
Contributor Author

/retest

1 similar comment
@wshwsh12
Copy link
Contributor Author

/retest

@wshwsh12
Copy link
Contributor Author

/test pull-integration-ddl-test

@tiprow tiprow
Copy link

tiprow bot commented Jul 25, 2024

@wshwsh12: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test fast_test_tiprow
  • /test tidb_parser_test

Use /test all to run all jobs.

In response to this:

/test pull-integration-ddl-test

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-sigs/prow repository.

@wshwsh12
Copy link
Contributor Author

/retest

@ti-chi-bot ti-chi-bot bot merged commit 0353655 into pingcap:master Jul 26, 2024
23 checks passed
morgo added a commit to morgo/tidb that referenced this pull request Jul 28, 2024
@morgo
Merge remote-tracking branch 'upstream/master' into add-default-literal
4424521 
* upstream/master: (93 commits)
  disjoinset: add generic impl (pingcap#54917)
  planner: derive index filters for mv index paths (pingcap#54877)
  br: cli refactor backup error handling logic (pingcap#54697)
  expression: fix infinity loop in `timestampadd` (pingcap#54916)
  planner: import more expand test. (pingcap#54962)
  planner: use code-gen to generate CloneForPlanCache method for some operators (pingcap#54957)
  test: fix flaky test TestFailSchemaSyncer (pingcap#54958)
  planner: move logical show into logicalop pkg. (pingcap#54928)
  privilege: Remove TestAbnormalMySQLTable (pingcap#54925)
  resource_control: support unlimited keyword when setting the resource group (pingcap#54704)
  ddl: fix a data race on localRowCntListener Written() (pingcap#54484)
  lightning: fix SET SESSION on connection pool (pingcap#54927)
  planner: move logical mem-table to logicalop pkg. (pingcap#54903)
  table: Add `CachedTableSupport` and `TemporaryTableSupport` for `MutateContext` (pingcap#54900)
  executor: fix index_hash_join hang when context canceled (pingcap#54855)
  statistics: add metrics for unneeded analyze table (pingcap#54822)
  *: refine pipelined dml benchmarks (pingcap#54844)
  ddl: assign table IDs for jobs submitted to queue (pingcap#54880)
  *: avoid using Tables field of model.DBInfo, use API instead (pingcap#52302)
  planner: remove useless check (pingcap#54907)
  ...
@XuHuaiyu XuHuaiyu added the needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. label Jul 29, 2024
@XuHuaiyu XuHuaiyu added needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. labels Jul 29, 2024
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jul 29, 2024
@wshwsh12 @ti-chi-bot
This is an automated cherry-pick of pingcap#54855
9214bf5 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Jul 29, 2024
Closed
13 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jul 29, 2024
@wshwsh12 @ti-chi-bot
This is an automated cherry-pick of pingcap#54855
e98ae27 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Jul 29, 2024
Merged
13 tasks
ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jul 29, 2024
@wshwsh12 @ti-chi-bot
This is an automated cherry-pick of pingcap#54855
4f53272 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Jul 29, 2024
Merged
13 tasks
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jul 29, 2024
@wshwsh12 @ti-chi-bot
This is an automated cherry-pick of pingcap#54855
0a7b552 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Jul 29, 2024
Merged
13 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jul 29, 2024
@wshwsh12 @ti-chi-bot
This is an automated cherry-pick of pingcap#54855
57da927 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Jul 29, 2024
Merged
13 tasks
ti-chi-bot bot pushed a commit that referenced this pull request Aug 1, 2024
@ti-chi-bot
executor: fix index_hash_join hang when context canceled (#54855) (#5…
9ddccb6 
…5008)

close #54688
ti-chi-bot bot pushed a commit that referenced this pull request Sep 2, 2024
@ti-chi-bot
executor: fix index_hash_join hang when context canceled (#54855) (#5…
1203ea2 
…5006)

close #54688
ti-chi-bot bot pushed a commit that referenced this pull request Sep 27, 2024
@ti-chi-bot
executor: fix index_hash_join hang when context canceled (#54855) (#5…
5d0ce34 
…5007)

close #54688
ti-chi-bot bot pushed a commit that referenced this pull request Nov 5, 2024
@ti-chi-bot
executor: fix index_hash_join hang when context canceled (#54855) (#5…
1ee4727 
…5005)

close #54688
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

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

Assignees
No one assigned
Labels
approved lgtm needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. ok-to-test Indicates a PR is ready to be tested. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

index_hash_join hang when context canceled
5 participants
@wshwsh12 @hawkingrei @ti-chi-bot @guo-shaoge @XuHuaiyu