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

Revert "Refine cancel for read thread stream (#8511)" (#8541) #8544

Merged
merged 2 commits into from
Dec 18, 2023
Merged

Revert "Refine cancel for read thread stream (#8511)" (#8541) #8544

merged 2 commits into from
Dec 18, 2023

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #8541

This reverts commit adf8569.

What problem does this PR solve?

Issue Number: close #8539

Problem Summary:
See #8539

What is changed and how it works?

#8511 introduced an issue that WorkQueue<Block> in SegmentReadTaskPool may not finish forever. Revert this PR to fix this issue for safety and simplicity.

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

None

@ti-chi-bot ti-chi-bot added 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. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR. type/cherry-pick-for-release-6.5-20231215-v6.5.3 labels Dec 18, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 18, 2023
Merged
12 tasks
@gengliqi
fix conflict
19305c0 
Signed-off-by: gengliqi <[email protected]>
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Dec 18, 2023
@ti-chi-bot ti-chi-bot bot added the lgtm label Dec 18, 2023
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Dec 18, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gengliqi, SeaRise

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:

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 removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Dec 18, 2023
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Dec 18, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-12-18 08:01:30.887564719 +0000 UTC m=+861581.924791645: ☑️ agreed by gengliqi.
  • 2023-12-18 08:02:51.399244037 +0000 UTC m=+861662.436470958: ☑️ agreed by SeaRise.

@gengliqi
Copy link
Contributor

/run-all-tests

@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Dec 18, 2023
@ti-chi-bot ti-chi-bot bot merged commit 632eb5b into pingcap:release-7.1 Dec 18, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SeaRise SeaRise SeaRise approved these changes

@gengliqi gengliqi gengliqi approved these changes

Assignees

@gengliqi gengliqi

Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm 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. type/cherry-pick-for-release-6.5-20231215-v6.5.3 type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ti-chi-bot @gengliqi @SeaRise