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

mcs: refactor tso handler #6964

Merged
merged 3 commits into from
Aug 29, 2023
Merged

mcs: refactor tso handler #6964

merged 3 commits into from
Aug 29, 2023

Conversation

rleungx
Copy link
Member

@rleungx rleungx commented Aug 16, 2023

What problem does this PR solve?

Issue Number: Ref #5839.

What is changed and how does it work?

Need to merge #6963 first.

Check List

Tests

  • Unit test
  • Manual test
tiup-playground nightly --pd.mode ms

try small one:

curl -X POST 127.0.0.1:2379/pd/api/v1/admin/reset-ts --data '{"tso":"329750308454400000"}'
[PD:tso:ErrResetUserTimestamp]reset user timestamp failed, the specified ts is smaller than now%

try large one:

curl -X POST 127.0.0.1:2379/pd/api/v1/admin/reset-ts --data '{"tso":"919750308454400000", "force-use-larger":true}'
Reset ts successfully.%

pd log:

[2023/08/16 18:30:50.801 +08:00] [INFO] [server.go:409] [reset-ts] [new-ts=329750308454400000] [ignore-smaller=false] [skip-upper-bound-check=false] [keyspace-group-id=0]
[2023/08/16 18:32:16.709 +08:00] [INFO] [server.go:409] [reset-ts] [new-ts=919750308454400000] [ignore-smaller=false] [skip-upper-bound-check=false] [keyspace-group-id=0]
[2023/08/16 18:32:31.409 +08:00] [INFO] [server.go:409] [reset-ts] [new-ts=919750308454400000] [ignore-smaller=true] [skip-upper-bound-check=true] [keyspace-group-id=0]
[2023/08/16 18:32:31.432 +08:00] [WARN] [tso.go:312] ["the logical time may be not enough"] [prev-logical=196608]

Release note

None.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 16, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JmPotato
  • lhy1024

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 the release-note-none Denotes a PR that doesn't merit a release note. label Aug 16, 2023
@ti-chi-bot ti-chi-bot bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Aug 16, 2023
@rleungx rleungx mentioned this pull request Aug 24, 2023
Closed
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 28, 2023
JmPotato
JmPotato reviewed Aug 29, 2023
View reviewed changes
Copy link
Member

@JmPotato JmPotato left a comment

Choose a reason for hiding this comment

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

The rest LGTM.

pkg/mcs/tso/server/server.go
@@ -411,6 +404,28 @@ func (s *Server) SetExternalTS(externalTS uint64) error {
return nil
}

// ResetTS resets the TSO with the specified one.
func (s *Server) ResetTS(ts uint64, ignoreSmaller, skipUpperBoundCheck bool, keyspaceGroupID uint32) error {
log.Info("reset-ts",
Copy link
Member

Choose a reason for hiding this comment

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

Will this log be overwhelmed?

Copy link
Member Author

Choose a reason for hiding this comment

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

It is the same as the PD mode. I think it's OK?

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

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 29, 2023

@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
Copy link
Contributor

ti-chi-bot bot commented Aug 29, 2023

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

Commit hash: 19c4165

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 29, 2023
@rleungx
unify the microservice http setting
e08f3e3 
Signed-off-by: Ryan Leung <rleungx@gmail.com>
@rleungx
fix test
12c109a 
Signed-off-by: Ryan Leung <rleungx@gmail.com>
@ti-chi-bot ti-chi-bot bot removed the status/can-merge Indicates a PR has been approved by a committer. label Aug 29, 2023
@rleungx
Copy link
Member Author

rleungx commented Aug 29, 2023

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 29, 2023

@rleungx: 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
Copy link
Contributor

ti-chi-bot bot commented Aug 29, 2023

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

Commit hash: 12c109a

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 29, 2023
@rleungx
fix test
d6fdfb5 
Signed-off-by: Ryan Leung <rleungx@gmail.com>
@ti-chi-bot ti-chi-bot bot removed the status/can-merge Indicates a PR has been approved by a committer. label Aug 29, 2023
@rleungx
Copy link
Member Author

rleungx commented Aug 29, 2023

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 29, 2023

@rleungx: 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
Copy link
Contributor

ti-chi-bot bot commented Aug 29, 2023

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

Commit hash: d6fdfb5

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 29, 2023
@ti-chi-bot ti-chi-bot bot merged commit 425a094 into tikv:master Aug 29, 2023
19 checks passed
@rleungx rleungx deleted the refactor-tso-handler branch August 29, 2023 05:50
@lhy1024 lhy1024 mentioned this pull request Nov 1, 2023
Closed
25 tasks
rleungx added a commit to rleungx/pd that referenced this pull request Dec 1, 2023
@rleungx
mcs: refactor tso handler (tikv#6964)
c402668 
ref tikv#5839

Signed-off-by: Ryan Leung <rleungx@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lhy1024 lhy1024 lhy1024 approved these changes

@JmPotato JmPotato JmPotato approved these changes

Assignees
No one assigned
Labels
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
Milestone
No milestone
Development

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