Skip to content

client: only report error when EnableTSOFollowerProxy is true in ms mode (#9130)#9803

Merged
ti-chi-bot[bot] merged 4 commits intotikv:release-8.5from
ti-chi-bot:cherry-pick-9130-to-release-8.5
Oct 13, 2025
Merged

client: only report error when EnableTSOFollowerProxy is true in ms mode (#9130)#9803
ti-chi-bot[bot] merged 4 commits intotikv:release-8.5from
ti-chi-bot:cherry-pick-9130-to-release-8.5

Conversation

@ti-chi-bot
Copy link
Copy Markdown
Member

@ti-chi-bot ti-chi-bot commented Oct 9, 2025

This is an automated cherry-pick of #9130

What problem does this PR solve?

Issue Number: Close #9129

What is changed and how does it work?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Release note

None.

@nolouch @ti-chi-bot
This is an automated cherry-pick of tikv#9130
4ced2d7 
close tikv#9129

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added dco-signoff: yes Indicates the PR's author has signed the dco. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR. labels Oct 9, 2025
@ti-chi-bot ti-chi-bot mentioned this pull request Oct 9, 2025
Merged
@ti-chi-bot
Copy link
Copy Markdown
Member Author

ti-chi-bot commented Oct 9, 2025

@nolouch This PR has conflicts, I have hold it.
Please resolve them or ask others to resolve them, then comment /unhold to remove the hold label.

@ti-chi-bot
Copy link
Copy Markdown
Contributor

ti-chi-bot bot commented Oct 9, 2025

@ti-chi-bot: ## If you want to know how to resolve it, please read the guide in TiDB Dev Guide.

Details

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.

@ti-chi-bot ti-chi-bot bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cherry-pick-approved Cherry pick PR approved by release team. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. do-not-merge/cherry-pick-not-approved labels Oct 9, 2025
@nolouch
fix
15549b6 
Signed-off-by: nolouch <nolouch@gmail.com>
@ti-chi-bot ti-chi-bot bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 11, 2025
@nolouch nolouch removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 11, 2025
@codecov
Copy link
Copy Markdown

codecov bot commented Oct 11, 2025 •
edited
Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 75.85%. Comparing base (b448fca) to head (f2f92ec).
⚠️ Report is 2 commits behind head on release-8.5.

Additional details and impacted files 
@@               Coverage Diff               @@
##           release-8.5    #9803      +/-   ##
===============================================
- Coverage        75.92%   75.85%   -0.08%     
===============================================
  Files              467      467              
  Lines            73919    73920       +1     
===============================================
- Hits             56121    56070      -51     
- Misses           14239    14286      +47     
- Partials          3559     3564       +5
Flag Coverage Δ
unittests 75.85% <100.00%> (-0.08%) ⬇️

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@jebter jebter requested review from JmPotato and lhy1024 October 13, 2025 01:56
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Oct 13, 2025
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Oct 13, 2025
@ti-chi-bot
Copy link
Copy Markdown
Contributor

ti-chi-bot bot commented Oct 13, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-10-13 08:50:46.79302896 +0000 UTC m=+84152.870281510: ☑️ agreed by nolouch.
  • 2025-10-13 08:51:20.713086555 +0000 UTC m=+84186.790339125: ☑️ agreed by rleungx.

@rleungx
Copy link
Copy Markdown
Member

rleungx commented Oct 13, 2025

/hold

@ti-chi-bot ti-chi-bot bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 13, 2025
@rleungx
fix
e2f4a90 
Signed-off-by: Ryan Leung <rleungx@gmail.com>
nolouch
nolouch reviewed Oct 13, 2025
View reviewed changes
@rleungx
fix
f2f92ec 
Signed-off-by: Ryan Leung <rleungx@gmail.com>
@ti-chi-bot
Copy link
Copy Markdown
Contributor

ti-chi-bot bot commented Oct 13, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JmPotato, nolouch, rleungx

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [JmPotato,nolouch,rleungx]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@rleungx
Copy link
Copy Markdown
Member

rleungx commented Oct 13, 2025

/hold cancel

@ti-chi-bot ti-chi-bot bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 13, 2025
@ti-chi-bot ti-chi-bot bot merged commit aa5b0e9 into tikv:release-8.5 Oct 13, 2025
23 checks passed
@ti-chi-bot ti-chi-bot bot deleted the cherry-pick-9130-to-release-8.5 branch October 13, 2025 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rleungx rleungx rleungx approved these changes

@JmPotato JmPotato JmPotato approved these changes

@nolouch nolouch nolouch approved these changes

@lhy1024 lhy1024 Awaiting requested review from lhy1024

Assignees

@nolouch nolouch

Labels

approved cherry-pick-approved Cherry pick PR approved by release team. dco-signoff: yes Indicates the PR's author has signed the dco. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ti-chi-bot @rleungx @JmPotato @nolouch
⚡