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

fix(cdc): failed to start when connects to pd with multiple endpoints and the 1st endpoint is not available (#4779) #5209

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #4779

What problem does this PR solve?

Issue Number: close #4777

What is changed and how it works?

Changed:

remove the grpcTLSOption in etcd client config,

how it works:

etcd-io/etcd#11184 have provide an workaround to set authority to deal with the problem indicated in etcd-io/etcd#11180, what it does it to create an TransportCredentialsWithDialer interface which wraps the original grpccredentials.TransportCredentials. and its implementation here, this TransportCredentialsWithDialer will set authority to the corresponding enpoint at ClientHandshake period first, and then delegate other logic to original TransportCredentials, so as to ensure the authority is correct.
But if we set grpcTLSOption in dialOptions, this will overwrite the existing TransportCredentialsWithDialer with original grpc TransportCredentials.

func (s *Credential) ToGRPCDialOption() (grpc.DialOption, error) {
tlsCfg, err := s.ToTLSConfig()
if err != nil || tlsCfg == nil {
return grpc.WithInsecure(), err
}
return grpc.WithTransportCredentials(credentials.NewTLS(tlsCfg)), nil

This PR will remove the the grpcTLSOption in etcd client config, thus won't overwrite the existing TransportCredentialsWithDialer.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Code changes

  • Has exported function/method change
  • Has exported variable/fields change
  • Has interface methods change
  • Has persistent data change

Side effects

  • Possible performance regression
  • Increased code complexity
  • Breaking backward compatibility

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation
  • Need to update key monitor metrics in both TiCDC document and official document

Release note

fix the issue that ticdc failed to start when connects to  multiple pd endpoints with tls-enabled and the 1st endpoint is not available

@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has not been approved.

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 do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. cherry-pick-approved Cherry pick PR approved by release team. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-5.3 This PR is cherry-picked to release-5.3 from a source PR. and removed do-not-merge/cherry-pick-not-approved labels Apr 19, 2022
@codecov-commenter
Copy link

codecov-commenter commented Apr 19, 2022

Codecov Report

❗ No coverage uploaded for pull request base (release-5.3@dcb5b39). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head c91ad30 differs from pull request most recent head 2ccb47f. Consider uploading reports for the commit 2ccb47f to get more accurate results

@@               Coverage Diff                @@
##             release-5.3      #5209   +/-   ##
================================================
  Coverage               ?   55.7352%           
================================================
  Files                  ?        224           
  Lines                  ?      23870           
  Branches               ?          0           
================================================
  Hits                   ?      13304           
  Misses                 ?       9239           
  Partials               ?       1327           

@asddongmen
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: ca1d548

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 16, 2022
@zhaoxinyu
Copy link
Contributor

/run-unit-test
/run-kafka-integration-test

@zhaoxinyu
Copy link
Contributor

/run-all-tests

@zhaoxinyu
Copy link
Contributor

/run-verify

@ti-chi-bot ti-chi-bot merged commit d0e603b into pingcap:release-5.3 Jun 16, 2022
@heibaijian heibaijian added this to the v5.3.2 milestone Jun 20, 2022
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 Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 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. type/cherry-pick-for-release-5.3 This PR is cherry-picked to release-5.3 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants