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.

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

executor: fix IndexMerge handle panic logic (#41036) #41062

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #41036

What problem does this PR solve?

Issue Number: close #41047

Problem Summary:
There are five kinds of workers in IndexMergeReaderExecutor:

  1. partialIndexWorker/partialTableWorker: get handles from rows, then send handles to processWorker.
  2. processWorker: do Union or Intersection of handles., then send handles to tableScanWorker. Also it send task to main goroutine using resultCh.
  3. tableScanWorker: fetch row from tikv using handles, then send rows to main goroutine
  4. partTblIntersectionWorker: For dynamic partition table, for each partition, start a goroutine to do intersection. This is to speed up intersection processing.
  5. main goroutine: wait for tableScanWorker to get rows.

Why panic:

  1. processWorker finish, so it close resultCh. code
  2. partialIndexWorker got error, then try to send error using resultCh. code
  3. got write to closed channel panic.

What is changed and how it works?

  1. partialIndexWorker/partialTableWorker should not use resultCh to send error. Instead should use fetchCh, which is used to send task to processWorker.
  2. processWorker should check err in task, which is received from fetchCh. If got error, just stop processing.
  3. add handleIntersectionProcessWorkerPanic(), which is similar to handleLoopFetcherPanic. The latter will close(resultCh) when return.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
    1. load data using lighning, too large to upload
    2. run sql as follows, and tidb doesn't crash when SQL is canceled because oom.
use s11_indexmerge_test;

set global tidb_server_memory_limit="500MB";
explain analyze select /*+ use_index_merge(tp2) */ * from tp2 where a < 40000000 or b < 40000000;
explain analyze select /*+ use_index_merge(tp2, ia, ib) */ * from tp2 where a < 40000000 and b < 40000000;

set tidb_mem_quota_query = 1000;
explain analyze select /*+ use_index_merge(tp2) */ * from tp2 where a < 40000000 or b < 40000000;
explain analyze select /*+ use_index_merge(tp2, ia, ib) */ * from tp2 where a < 40000000 and b < 40000000;

set tidb_mem_quota_query = 10<<20;
explain analyze select /*+ use_index_merge(tp2) */ * from tp2 where a < 40000000 or b < 40000000;
explain analyze select /*+ use_index_merge(tp2, ia, ib) */ * from tp2 where a < 40000000 and b < 40000000;

set tidb_mem_quota_query = 500<<20;
explain analyze select /*+ use_index_merge(tp2) */ * from tp2 where a < 40000000 or b < 40000000;
explain analyze select /*+ use_index_merge(tp2, ia, ib) */ * from tp2 where a < 40000000 and b < 40000000;
                                                                                                                                                                                                                                                            set tidb_mem_quota_query = 1<<30;
explain analyze select /*+ use_index_merge(tp2) */ * from tp2 where a < 40000000 or b < 40000000;
explain analyze select /*+ use_index_merge(tp2, ia, ib) */ * from tp2 where a < 40000000 and b < 40000000;

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

executor: fix IndexMerge handle panic logic

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Feb 5, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • guo-shaoge

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 release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved size/XL Denotes a PR that changes 500-999 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 5, 2023
@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 5, 2023
Signed-off-by: guo-shaoge <shaoge1994@163.com>
Signed-off-by: guo-shaoge <shaoge1994@163.com>
Signed-off-by: guo-shaoge <shaoge1994@163.com>
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
Copy link
Collaborator

/test unit-test

1 similar comment
@guo-shaoge
Copy link
Collaborator

/test unit-test

@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
@guo-shaoge
Copy link
Collaborator

/merge

@ti-chi-bot
Copy link
Member Author

@guo-shaoge: /merge in this pull request requires 2 approval(s).

In response to this:

/merge

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.

@guo-shaoge
Copy link
Collaborator

/test check_dev

@ti-chi-bot
Copy link
Member Author

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

  • /test build
  • /test check-dev
  • /test check-dev2
  • /test mysql-test
  • /test unit-test

Use /test all to run all jobs.

In response to this:

/test check_dev

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.

@guo-shaoge
Copy link
Collaborator

/test check-dev

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 29, 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 29, 2023
@guo-shaoge
Copy link
Collaborator

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 24d4db6

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 29, 2023
@ti-chi-bot ti-chi-bot merged commit 3012080 into pingcap:release-6.1 Mar 29, 2023
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved cherry-pick-approved Cherry pick PR approved by release team. and removed cherry-pick-approved Cherry pick PR approved by release team. do-not-merge/cherry-pick-not-approved labels Apr 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/XL Denotes a PR that changes 500-999 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
Development

Successfully merging this pull request may close these issues.

5 participants