mcs: solve stream error when forward tso #7327

lhy1024 · 2023-11-07T07:45:25Z

What problem does this PR solve?

Issue Number: Close #7320

What is changed and how does it work?

Check List

Tests

Unit test

Release note

None.

ti-chi-bot · 2023-11-07T07:45:27Z

[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.

Signed-off-by: lhy1024 <admin@liudos.us>

pkg/utils/grpcutil/grpcutil.go

codecov · 2023-11-07T09:04:40Z

Codecov Report

Merging #7327 (565c9b3) into master (a98295c) will increase coverage by 0.04%.
The diff coverage is 82.35%.

❗ Current head 565c9b3 differs from pull request most recent head e01c28a. Consider uploading reports for the commit e01c28a to get more accurate results

@@            Coverage Diff             @@
##           master    #7327      +/-   ##
==========================================
+ Coverage   74.43%   74.47%   +0.04%     
==========================================
  Files         446      446              
  Lines       48440    48435       -5     
==========================================
+ Hits        36055    36073      +18     
+ Misses       9194     9179      -15     
+ Partials     3191     3183       -8

Flag	Coverage Δ
unittests	`74.47% <82.35%> (+0.04%)`	⬆️

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

Signed-off-by: lhy1024 <admin@liudos.us>

rleungx · 2023-11-08T03:51:24Z

/cc @CabinfeverB

CabinfeverB

rest LGTM

server/grpc_service.go

Signed-off-by: lhy1024 <admin@liudos.us>

CabinfeverB · 2023-11-08T08:41:37Z

server/grpc_service.go

@@ -2648,6 +2646,7 @@ func (s *GrpcServer) getGlobalTSO(ctx context.Context) (pdpb.Timestamp, error) {
 		err = forwardStream.Send(request)
 		if err != nil {
 			if needRetry := handleStreamError(err); needRetry {
+				time.Sleep(retryIntervalRequestTSOServer)


How about move it into the beginning of the for statement? Check if i == 0

Signed-off-by: lhy1024 <admin@liudos.us>

lhy1024 · 2023-11-08T08:58:15Z

/merge

ti-chi-bot · 2023-11-08T08:58:18Z

@lhy1024: 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 · 2023-11-08T08:58:20Z

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

Commit hash: e01c28a

* mcs: solve forward stream error (tikv#7321) close tikv#7320 Signed-off-by: lhy1024 <admin@liudos.us> * mcs: solve stream error when forward tso (tikv#7327) close tikv#7320 Signed-off-by: lhy1024 <admin@liudos.us> --------- Signed-off-by: lhy1024 <admin@liudos.us>

Signed-off-by: lhy1024 <admin@liudos.us>

ti-chi-bot bot added the release-note-none Denotes a PR that doesn't merit a release note. label Nov 7, 2023

ti-chi-bot bot requested review from disksing and HunDunDM November 7, 2023 07:45

ti-chi-bot bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 7, 2023

mcs: solve stream error when forward tso

b7b6bc9

Signed-off-by: lhy1024 <admin@liudos.us>

lhy1024 force-pushed the fix-tso3 branch from 803b730 to b7b6bc9 Compare November 7, 2023 07:48

rleungx reviewed Nov 7, 2023

View reviewed changes

pkg/utils/grpcutil/grpcutil.go Outdated Show resolved Hide resolved

lhy1024 requested a review from rleungx November 7, 2023 09:05

ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 7, 2023

address comments and add EOF check

9bf40bd

Signed-off-by: lhy1024 <admin@liudos.us>

lhy1024 force-pushed the fix-tso3 branch from 28bc7ab to 9bf40bd Compare November 7, 2023 10:19

rleungx approved these changes Nov 8, 2023

View reviewed changes

ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 8, 2023

ti-chi-bot bot requested a review from CabinfeverB November 8, 2023 03:51

CabinfeverB reviewed Nov 8, 2023

View reviewed changes

server/grpc_service.go Outdated Show resolved Hide resolved

address comments

565c9b3

Signed-off-by: lhy1024 <admin@liudos.us>

CabinfeverB reviewed Nov 8, 2023

View reviewed changes

CabinfeverB approved these changes Nov 8, 2023

View reviewed changes

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 Nov 8, 2023

lhy1024 added 2 commits November 8, 2023 16:57

address comments

54e3398

Signed-off-by: lhy1024 <admin@liudos.us>

Merge branch 'master' into fix-tso3

e01c28a

ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 8, 2023

ti-chi-bot bot merged commit d189a42 into tikv:master Nov 8, 2023

lhy1024 deleted the fix-tso3 branch November 8, 2023 09:09

lhy1024 added a commit to ti-chi-bot/pd that referenced this pull request Feb 27, 2025

fix conflict and pick tikv#7327

5a191b6

Signed-off-by: lhy1024 <admin@liudos.us>

lhy1024 added a commit to ti-chi-bot/pd that referenced this pull request Feb 27, 2025

fix conflict and pick tikv#7327

89fafcb

Signed-off-by: lhy1024 <admin@liudos.us>

lhy1024 added a commit to ti-chi-bot/pd that referenced this pull request Feb 27, 2025

fix and pick tikv#6341 tikv#6279 tikv#7327

8ec1daf

Signed-off-by: lhy1024 <admin@liudos.us>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

mcs: solve stream error when forward tso #7327

mcs: solve stream error when forward tso #7327

Uh oh!

lhy1024 commented Nov 7, 2023

Uh oh!

ti-chi-bot bot commented Nov 7, 2023 •

edited

Loading

Uh oh!

Uh oh!

codecov bot commented Nov 7, 2023 •

edited

Loading

Uh oh!

rleungx commented Nov 8, 2023

Uh oh!

CabinfeverB left a comment

Uh oh!

Uh oh!

CabinfeverB Nov 8, 2023

Uh oh!

lhy1024 commented Nov 8, 2023

Uh oh!

ti-chi-bot bot commented Nov 8, 2023

Uh oh!

ti-chi-bot bot commented Nov 8, 2023

Uh oh!

Uh oh!

mcs: solve stream error when forward tso #7327

mcs: solve stream error when forward tso #7327

Uh oh!

Conversation

lhy1024 commented Nov 7, 2023

What problem does this PR solve?

What is changed and how does it work?

Check List

Release note

Uh oh!

ti-chi-bot bot commented Nov 7, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Nov 7, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

rleungx commented Nov 8, 2023

Uh oh!

CabinfeverB left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

CabinfeverB Nov 8, 2023

Choose a reason for hiding this comment

Uh oh!

lhy1024 commented Nov 8, 2023

Uh oh!

ti-chi-bot bot commented Nov 8, 2023

Uh oh!

ti-chi-bot bot commented Nov 8, 2023

Uh oh!

Uh oh!

ti-chi-bot bot commented Nov 7, 2023 •

edited

Loading

codecov bot commented Nov 7, 2023 •

edited

Loading