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

client: enabling TSO Follower Proxy with TSO service should fail #7833

Merged
merged 1 commit into from
Feb 21, 2024
Merged

client: enabling TSO Follower Proxy with TSO service should fail #7833

merged 1 commit into from
Feb 21, 2024

Conversation

JmPotato
Copy link
Member

@JmPotato JmPotato commented Feb 21, 2024 •
edited
Loading

What problem does this PR solve?

Issue Number: ref #5836 and pingcap/tidb#51194.

What is changed and how does it work?

Since the TSO service does not support the TSO Follower Proxy, enabling it in this case should fail.

Check List

Tests

  • Unit test
  • Integration test

Release note

None.

@JmPotato
Enabling TSO Follower Proxy with TSO service should fail
bb65fb4 
Signed-off-by: JmPotato <ghzpotato@gmail.com>
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Feb 21, 2024 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CabinfeverB
  • rleungx

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.

@JmPotato JmPotato added component/client Client logic. component/tso Timestamp Oracle. labels Feb 21, 2024
@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed do-not-merge/needs-triage-completed labels Feb 21, 2024
@codecov Codecov
Copy link

codecov bot commented Feb 21, 2024 •
edited
Loading

Codecov Report

Merging #7833 (bb65fb4) into master (46fd313) will decrease coverage by 0.01%.
The diff coverage is 66.66%.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #7833      +/-   ##
==========================================
- Coverage   73.44%   73.43%   -0.01%     
==========================================
  Files         432      432              
  Lines       47902    47913      +11     
==========================================
+ Hits        35181    35186       +5     
- Misses       9672     9680       +8     
+ Partials     3049     3047       -2
Flag Coverage Δ
unittests 73.43% <66.66%> (-0.01%) ⬇️

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

rleungx
rleungx reviewed Feb 21, 2024
View reviewed changes
client/client.go
@@ -702,6 +702,9 @@ func (c *client) UpdateOption(option DynamicOption, value any) error {
return err
}
case EnableTSOFollowerProxy:
if c.getServiceMode() != pdpb.ServiceMode_PD_SVC_MODE {
Copy link
Member

@rleungx rleungx Feb 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Does MaxTSOBatchWaitInterval also need it?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, MaxTSOBatchWaitInterval is supported since it only relies on the client implementation.

CabinfeverB
CabinfeverB reviewed Feb 21, 2024
View reviewed changes
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

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 21, 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 Feb 21, 2024
@JmPotato
Copy link
Member Author

/merge

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Feb 21, 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.

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Feb 21, 2024

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

Commit hash: bb65fb4

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 21, 2024
@CabinfeverB
Copy link
Member

/check-issue-triage-complete

@ti-chi-bot ti-chi-bot bot merged commit d6d9fea into tikv:master Feb 21, 2024
24 of 27 checks passed
@JmPotato JmPotato deleted the fix_tso_follower_proxy_switch branch February 21, 2024 05:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CabinfeverB CabinfeverB CabinfeverB approved these changes

@rleungx rleungx rleungx approved these changes

Assignees
No one assigned
Labels
component/client Client logic. component/tso Timestamp Oracle. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JmPotato @CabinfeverB @rleungx