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 TSO may hang when switching mode #7937

Merged
merged 4 commits into from
Mar 19, 2024

Conversation

JmPotato
Copy link
Member

@JmPotato JmPotato commented Mar 18, 2024

What problem does this PR solve?

Issue Number: ref #7849.

What is changed and how does it work?

Because the old `(*tsoClient).dispatchRequest` only checked the request's context,
this could potentially cause a `tsoRequest` to be sent to a batch channel that has already
finished `revokePendingTokenRequest`, thus being left there forever without returning.

Check List

Tests

  • Unit test
  • Integration test

Release note

None.

@JmPotato JmPotato added the component/client Client logic. label Mar 18, 2024
Copy link
Contributor

ti-chi-bot bot commented Mar 18, 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. do-not-merge/needs-triage-completed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 18, 2024
Signed-off-by: JmPotato <ghzpotato@gmail.com>
Copy link

codecov bot commented Mar 18, 2024

Codecov Report

Merging #7937 (f44cd5a) into master (1331148) will increase coverage by 0.04%.
Report is 1 commits behind head on master.
The diff coverage is 83.33%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7937      +/-   ##
==========================================
+ Coverage   73.47%   73.51%   +0.04%     
==========================================
  Files         436      436              
  Lines       48349    48362      +13     
==========================================
+ Hits        35523    35554      +31     
+ Misses       9765     9751      -14     
+ Partials     3061     3057       -4     
Flag Coverage Δ
unittests 73.51% <83.33%> (+0.04%) ⬆️

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

Signed-off-by: JmPotato <ghzpotato@gmail.com>
Copy link
Member

@CabinfeverB CabinfeverB left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rest LGTM

client/client.go Outdated Show resolved Hide resolved
Signed-off-by: JmPotato <ghzpotato@gmail.com>
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 19, 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 19, 2024
@CabinfeverB
Copy link
Member

/merge

Copy link
Contributor

ti-chi-bot bot commented Mar 19, 2024

@CabinfeverB: 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 19, 2024

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

Commit hash: 0c3741d

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 19, 2024
@ti-chi-bot ti-chi-bot bot merged commit d3b94c9 into tikv:master Mar 19, 2024
25 of 26 checks passed
@JmPotato JmPotato deleted the fix_tso_hang_during_switch branch March 19, 2024 07:12
@CabinfeverB CabinfeverB added 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.0 The PR needs to cherry pick to release-8.0 branch. labels Mar 19, 2024
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Mar 19, 2024
ref tikv#7849

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Mar 19, 2024
ref tikv#7849

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

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

@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. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.0 The PR needs to cherry pick to release-8.0 branch. 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. 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.

4 participants