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

server(gRPC): use the PD leader member in server if it's not in etcd members #7753

Merged
merged 3 commits into from
Jan 24, 2024
Merged

server(gRPC): use the PD leader member in server if it's not in etcd members #7753

merged 3 commits into from
Jan 24, 2024

Conversation

JmPotato
Copy link
Member

What problem does this PR solve?

Issue Number: close #7752.

What is changed and how does it work?

Use the PD leader member set in the server if it's not in the etcd member list to gain a better chance to work.

Check List

Tests

  • Unit test
  • Integration test

Release note

None.

@JmPotato JmPotato requested a review from rleungx January 24, 2024 04:06
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jan 24, 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.

@ti-chi-bot ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 24, 2024
@codecov Codecov
Copy link

codecov bot commented Jan 24, 2024 •
edited
Loading

Codecov Report

Merging #7753 (3529d38) into master (1a38582) will increase coverage by 4.63%.
Report is 1 commits behind head on master.
The diff coverage is 100.00%.

❗ Current head 3529d38 differs from pull request most recent head 3caf4c8. Consider uploading reports for the commit 3caf4c8 to get more accurate results

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #7753      +/-   ##
==========================================
+ Coverage   69.24%   73.88%   +4.63%     
==========================================
  Files         430      430              
  Lines       47641    47634       -7     
==========================================
+ Hits        32987    35192    +2205     
+ Misses      11936     9456    -2480     
- Partials     2718     2986     +268
Flag Coverage Δ
unittests 73.88% <100.00%> (+4.63%) ⬆️

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

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 24, 2024
CabinfeverB
CabinfeverB approved these changes Jan 24, 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

server/grpc_service.go Outdated Show resolved Hide resolved
@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 Jan 24, 2024
@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 24, 2024
@JmPotato
Copy link
Member Author

/merge

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

ti-chi-bot bot commented Jan 24, 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 Jan 24, 2024

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

Commit hash: 0582b32

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 24, 2024
@ti-chi-bot ti-chi-bot bot merged commit d3b9307 into tikv:master Jan 24, 2024
22 checks passed
@JmPotato JmPotato deleted the fallback_pd_leader_member branch January 24, 2024 08:02
JmPotato added a commit to JmPotato/pd that referenced this pull request Jan 25, 2024
@JmPotato
Revert "server(gRPC): use the PD leader member in server if it's not …
ba11d6a 
…in etcd members (tikv#7753)"

This reverts commit d3b9307.
@JmPotato JmPotato mentioned this pull request Jan 25, 2024
Merged
JmPotato added a commit to JmPotato/pd that referenced this pull request Jan 25, 2024
@JmPotato
Revert "server(gRPC): use the PD leader member in server if it's not …
055f45f 
…in etcd members (tikv#7753)"

This reverts commit d3b9307.

Signed-off-by: JmPotato <[email protected]>
ti-chi-bot bot pushed a commit that referenced this pull request Jan 25, 2024
@JmPotato
Revert "Use the PD leader member in server if it's not in etcd members (
9a82b47 
#7753)" (#7755)

ref #7752

This reverts commit d3b9307 from #7753.

Signed-off-by: JmPotato <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rleungx rleungx rleungx approved these changes

@CabinfeverB CabinfeverB CabinfeverB approved these changes

Assignees
No one assigned
Labels
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.

Fallback to use the PD leader member info if it does not exist in etcd member list
3 participants
@JmPotato @CabinfeverB @rleungx