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

client/tso: fix the bug that collected TSO requests could never be finished #7951

Merged
merged 1 commit into from
Mar 20, 2024

Conversation

JmPotato
Copy link
Member

@JmPotato JmPotato commented Mar 20, 2024

What problem does this PR solve?

Issue Number: close #7849.

What is changed and how does it work?

If the `dispatcherCtx` is canceled, the collected `tsoRequest`s could be left unfinished forever,
which could cause the upper caller never to get the results. This PR fixed this bug by finishing them
on all the possible paths.

Check List

Tests

  • Unit test
  • Integration test

Release note

None.

@JmPotato JmPotato added the component/client Client logic. label Mar 20, 2024
@JmPotato JmPotato requested review from CabinfeverB and HuSharp March 20, 2024 06:13
Copy link
Contributor

ti-chi-bot bot commented Mar 20, 2024

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CabinfeverB
  • HuSharp

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 bot added 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. labels Mar 20, 2024
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 20, 2024
@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Mar 20, 2024
@HuSharp
Copy link
Member

HuSharp commented Mar 20, 2024

TestGetTSWhileRestingTSOClient ci failed :(

@JmPotato JmPotato force-pushed the fix_tso_hang_during_switch branch from fc5b37a to b190062 Compare March 20, 2024 07:43
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 20, 2024
@JmPotato JmPotato force-pushed the fix_tso_hang_during_switch branch from b190062 to 51ad007 Compare March 20, 2024 07:56
@JmPotato
Copy link
Member Author

/merge

Copy link
Contributor

ti-chi-bot bot commented Mar 20, 2024

@JmPotato: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

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.

Copy link
Contributor

ti-chi-bot bot commented Mar 20, 2024

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

Commit hash: 51ad007

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 20, 2024
@ti-chi-bot ti-chi-bot bot merged commit c00c42e into tikv:master Mar 20, 2024
22 checks passed
@JmPotato JmPotato deleted the fix_tso_hang_during_switch branch March 20, 2024 08:17
@ti-chi-bot ti-chi-bot added the needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. label Apr 18, 2024
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot ti-chi-bot removed the needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. label Apr 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/client Client logic. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

(pdms)tpcc continues to report a lot of Error 8027 after disable/enable ms mode
4 participants