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.

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

client: fix compatibility problem of pd client (#6244) #6245

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #6244

What problem does this PR solve?

Issue Number: Close #6243.

What is changed and how does it work?

Check List

Tests

  • Manual test

By using tiup playground: tiup playground v6.6.0 --db 1 --pd 3 --kv 4 --tiflash 0 --host 172.16.4.3 and replace the tidb binary with the fixed one.

Release note

None.

Signed-off-by: Ryan Leung <rleungx@gmail.com>
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Mar 29, 2023

[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 added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 29, 2023
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Mar 29, 2023
@rleungx
Copy link
Member

rleungx commented Mar 29, 2023

/merge

@ti-chi-bot
Copy link
Member Author

@rleungx: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

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
Member Author

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

Commit hash: 1802a2e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 29, 2023
@rleungx rleungx closed this Mar 29, 2023
@rleungx rleungx reopened this Mar 29, 2023
@rleungx
Copy link
Member

rleungx commented Mar 29, 2023

/merge

@ti-chi-bot
Copy link
Member Author

@rleungx: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

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.

@codecov
Copy link

codecov bot commented Mar 29, 2023

Codecov Report

Patch coverage: 62.50% and project coverage change: -0.14 ⚠️

Comparison is base (0f3bf1b) 74.69% compared to head (1802a2e) 74.55%.

Additional details and impacted files
@@               Coverage Diff               @@
##           release-7.0    #6245      +/-   ##
===============================================
- Coverage        74.69%   74.55%   -0.14%     
===============================================
  Files              394      394              
  Lines            38760    38763       +3     
===============================================
- Hits             28950    28901      -49     
- Misses            7276     7303      +27     
- Partials          2534     2559      +25     
Flag Coverage Δ
unittests 74.55% <62.50%> (-0.14%) ⬇️

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

Impacted Files Coverage Δ
client/pd_service_discovery.go 87.25% <62.50%> (-0.81%) ⬇️

... and 26 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@ti-chi-bot ti-chi-bot merged commit da5a4e9 into tikv:release-7.0 Mar 29, 2023
if err != nil {
log.Warn("[pd] failed to get cluster info for the leader", zap.String("leader-addr", leaderAddr), errs.ZapError(err))
// TODO: it's a hack way to solve the compatibility issue.
Copy link
Contributor

Choose a reason for hiding this comment

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

Probably we need to add service mode to the every rpc response from the pd/api and handle it gracefully.

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. labels Mar 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-7.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants