mcs: close the connection to avoid retrying to connect #7757

rleungx · 2024-01-25T07:37:04Z

What problem does this PR solve?

Issue Number: Ref #5839.

What is changed and how does it work?

Check List

Tests

Manual test

Release note

None.

ti-chi-bot · 2024-01-25T07:37:07Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

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

lhy1024 · 2024-01-25T07:44:02Z

server/grpc_service.go

@@ -1332,6 +1331,8 @@ func (s *GrpcServer) RegionHeartbeat(stream pdpb.PD_RegionHeartbeatServer) error
 				if cancel != nil {
 					cancel()
 				}
+


if only switch primary, do we need to close it?

Both are ok to me.

lhy1024 · 2024-01-25T07:47:40Z

server/forward.go

-		}
-	} else if fh := grpcutil.GetForwardedHost(streamCtx); !s.isLocalRequest(fh) {
-		forwardedHost = fh
+func (s *GrpcServer) closeDelegateClient(forwardedHost string) {


Do we need to add some log?

lhy1024 · 2024-01-25T07:48:03Z

It works too.

codecov · 2024-01-25T07:49:14Z

Codecov Report

Merging #7757 (03f0fcd) into master (357ad3f) will decrease coverage by 3.47%.
Report is 1 commits behind head on master.
The diff coverage is 68.18%.

❗ Current head 03f0fcd differs from pull request most recent head ad701a9. Consider uploading reports for the commit ad701a9 to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #7757      +/-   ##
==========================================
- Coverage   73.52%   70.06%   -3.47%     
==========================================
  Files         430      430              
  Lines       47745    47643     -102     
==========================================
- Hits        35106    33380    -1726     
- Misses       9627    11518    +1891     
+ Partials     3012     2745     -267

Flag	Coverage Δ
unittests	`70.06% <68.18%> (-3.47%)`	⬇️

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

pkg/utils/grpcutil/grpcutil.go

server/forward.go

JmPotato · 2024-01-31T07:05:13Z

/merge

ti-chi-bot · 2024-01-31T07:05:15Z

@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 · 2024-01-31T07:05:16Z

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

Commit hash: 313ec06

rleungx · 2024-01-31T07:05:18Z

/merge

ti-chi-bot · 2024-01-31T07:05:20Z

@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 · 2024-01-31T07:35:04Z

@rleungx: Your PR was out of date, I have automatically updated it for you.

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.

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.

Signed-off-by: Ryan Leung <rleungx@gmail.com>

rleungx · 2024-01-31T09:03:14Z

/merge

ti-chi-bot · 2024-01-31T09:03:16Z

@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 · 2024-01-31T09:03:18Z

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

Commit hash: ad701a9

* mcs: close the connection to avoid retrying to connect (tikv#7757) ref tikv#5839 Signed-off-by: Ryan Leung <rleungx@gmail.com> * mcs: add store and region interface in scheduling server (tikv#7754) ref tikv#5839 Signed-off-by: lhy1024 <admin@liudos.us> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com> Signed-off-by: lhy1024 <admin@liudos.us> * remove test Signed-off-by: lhy1024 <admin@liudos.us> * fix test Signed-off-by: lhy1024 <admin@liudos.us> --------- Signed-off-by: Ryan Leung <rleungx@gmail.com> Signed-off-by: lhy1024 <admin@liudos.us> Co-authored-by: Ryan Leung <rleungx@gmail.com> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>

ti-chi-bot bot added the release-note-none Denotes a PR that doesn't merit a release note. label Jan 25, 2024

ti-chi-bot bot requested review from disksing and lhy1024 January 25, 2024 07:37

ti-chi-bot bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 25, 2024

rleungx requested review from JmPotato and CabinfeverB and removed request for disksing January 25, 2024 07:46

lhy1024 reviewed Jan 25, 2024

View reviewed changes

CabinfeverB approved these changes Jan 29, 2024

View reviewed changes

ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 29, 2024

lhy1024 approved these changes Jan 31, 2024

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 Jan 31, 2024

JmPotato reviewed Jan 31, 2024

View reviewed changes

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

server/forward.go Outdated Show resolved Hide resolved

rleungx requested a review from JmPotato January 31, 2024 07:03

JmPotato approved these changes Jan 31, 2024

View reviewed changes

ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 31, 2024

rleungx added 4 commits January 31, 2024 16:51

close the connection to avoid retrying to connect

bdcd475

Signed-off-by: Ryan Leung <rleungx@gmail.com>

address comments

ae3d78b

Signed-off-by: Ryan Leung <rleungx@gmail.com>

address comments

0626a93

Signed-off-by: Ryan Leung <rleungx@gmail.com>

fix

ad701a9

Signed-off-by: Ryan Leung <rleungx@gmail.com>

rleungx force-pushed the close-conn branch from 0ea256e to ad701a9 Compare January 31, 2024 08:51

ti-chi-bot bot removed the status/can-merge Indicates a PR has been approved by a committer. label Jan 31, 2024

ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 31, 2024

ti-chi-bot bot merged commit 9721654 into tikv:master Jan 31, 2024
22 checks passed

rleungx deleted the close-conn branch January 31, 2024 10:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

mcs: close the connection to avoid retrying to connect #7757

mcs: close the connection to avoid retrying to connect #7757

rleungx commented Jan 25, 2024 •

edited

Loading

ti-chi-bot bot commented Jan 25, 2024 •

edited

Loading

lhy1024 Jan 25, 2024

rleungx Jan 25, 2024

lhy1024 Jan 25, 2024

lhy1024 commented Jan 25, 2024

codecov bot commented Jan 25, 2024 •

edited

Loading

JmPotato commented Jan 31, 2024

ti-chi-bot bot commented Jan 31, 2024

ti-chi-bot bot commented Jan 31, 2024

rleungx commented Jan 31, 2024

ti-chi-bot bot commented Jan 31, 2024

ti-chi-bot bot commented Jan 31, 2024

rleungx commented Jan 31, 2024

ti-chi-bot bot commented Jan 31, 2024

ti-chi-bot bot commented Jan 31, 2024

mcs: close the connection to avoid retrying to connect #7757

mcs: close the connection to avoid retrying to connect #7757

Conversation

rleungx commented Jan 25, 2024 • edited Loading

What problem does this PR solve?

What is changed and how does it work?

Check List

Release note

ti-chi-bot bot commented Jan 25, 2024 • edited Loading

lhy1024 Jan 25, 2024

Choose a reason for hiding this comment

rleungx Jan 25, 2024

Choose a reason for hiding this comment

lhy1024 Jan 25, 2024

Choose a reason for hiding this comment

lhy1024 commented Jan 25, 2024

codecov bot commented Jan 25, 2024 • edited Loading

Codecov Report

JmPotato commented Jan 31, 2024

ti-chi-bot bot commented Jan 31, 2024

ti-chi-bot bot commented Jan 31, 2024

rleungx commented Jan 31, 2024

ti-chi-bot bot commented Jan 31, 2024

ti-chi-bot bot commented Jan 31, 2024

rleungx commented Jan 31, 2024

ti-chi-bot bot commented Jan 31, 2024

ti-chi-bot bot commented Jan 31, 2024

rleungx commented Jan 25, 2024 •

edited

Loading

ti-chi-bot bot commented Jan 25, 2024 •

edited

Loading

codecov bot commented Jan 25, 2024 •

edited

Loading