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

Provide GetMinTS API to solve the compatibility issue brought by multi-timeline tso #6421

Merged
merged 10 commits into from
May 12, 2023
Merged

Provide GetMinTS API to solve the compatibility issue brought by multi-timeline tso #6421

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f73c70c
Import kvproto change to introduce GetMinTS rpc in the TSO service.
binshi-bing May 9, 2023
23190fd
Add server side implementation for GetMinTS rpc.
binshi-bing May 9, 2023
daefacf
Add client implementation for rpc GetMinTS in TSO Service.
binshi-bing May 9, 2023
df42ef5
fix bug
binshi-bing May 10, 2023
6bd6d37
Add test
binshi-bing May 10, 2023
2fbb04c
Refine test
binshi-bing May 10, 2023
16e5d20
Update to kvproto mster and handle feedback.
binshi-bing May 11, 2023
96ed025
Handle more feedback
binshi-bing May 12, 2023
69596c2
Fix flaky TestGetMinTS() test
binshi-bing May 12, 2023
2ee495d
Rebase
binshi-bing May 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix bug 
Signed-off-by: Bin Shi <binshi.bing@gmail.com>
  • Loading branch information
@binshi-bing
binshi-bing committed May 12, 2023
commit df42ef5dce8536b0cf12af3f70fe7bbb3557c068
2 changes: 1 addition & 1 deletion client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ func (c *client) setServiceMode(newMode pdpb.ServiceMode) {
}
newTSOCli.Setup()
// Replace the old TSO client.
oldTSOClient, _ := c.getServiceClientProxy()
oldTSOClient := c.tsoClient
c.tsoClient = newTSOCli
oldTSOClient.Close()
// Replace the old TSO service discovery if needed.
Expand Down
20 changes: 10 additions & 10 deletions pkg/mcs/tso/server/grpc_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,17 +158,17 @@ func (s *Service) Tso(stream tsopb.TSO_TsoServer) error {
func (s *Service) FindGroupByKeyspaceID(
ctx context.Context, request *tsopb.FindGroupByKeyspaceIDRequest,
) (*tsopb.FindGroupByKeyspaceIDResponse, error) {
if s.IsClosed() || s.keyspaceGroupManager == nil {
return &tsopb.FindGroupByKeyspaceIDResponse{
Header: s.wrapErrorToHeader(tsopb.ErrorType_NOT_BOOTSTRAPPED, ErrNotStarted.Error(), 0),
}, nil
}
// if s.IsClosed() || s.keyspaceGroupManager == nil {
// return &tsopb.FindGroupByKeyspaceIDResponse{
// Header: s.wrapErrorToHeader(tsopb.ErrorType_NOT_BOOTSTRAPPED, ErrNotStarted.Error(), 0),
// }, nil
// }

if request.GetHeader().GetClusterId() != s.clusterID {
return &tsopb.FindGroupByKeyspaceIDResponse{
Header: s.wrapErrorToHeader(tsopb.ErrorType_CLUSTER_MISMATCHED, ErrClusterMismatched.Error(), 0),
}, nil
}
// if request.GetHeader().GetClusterId() != s.clusterID {
// return &tsopb.FindGroupByKeyspaceIDResponse{
// Header: s.wrapErrorToHeader(tsopb.ErrorType_CLUSTER_MISMATCHED, ErrClusterMismatched.Error(), 0),
// }, nil
// }

keyspaceID := request.GetKeyspaceId()
am, keyspaceGroup, keyspaceGroupID, err := s.keyspaceGroupManager.FindGroupByKeyspaceID(keyspaceID)
Expand Down