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: directly save tls config #7662

Merged
merged 4 commits into from
Jan 5, 2024
Merged

Conversation

CabinfeverB
Copy link
Member

What problem does this PR solve?

Issue Number: ref #7576

What is changed and how does it work?

no need to transfer TLSConfig to tls.Config.
And after replacing it, we can check whether use tls more expediently.

Check List

Tests

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

Code changes

Side effects

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

Related changes

Release note

None.

Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>
Copy link
Contributor

ti-chi-bot bot commented Jan 4, 2024

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JmPotato
  • 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/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 4, 2024
client/client.go Outdated
@@ -358,7 +359,7 @@ func createClientWithKeyspace(
ctx context.Context, keyspaceID uint32, svrAddrs []string,
security SecurityOption, opts ...ClientOption,
) (Client, error) {
tlsCfg := &tlsutil.TLSConfig{
pdTlsCfg := &tlsutil.TLSConfig{
Copy link
Member

@rleungx rleungx Jan 4, 2024

Choose a reason for hiding this comment

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

How about
tlsCfg, err := &tlsutil.TLSConfig{...}.ToTLSConfig()?

Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>
Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 4, 2024
Copy link

codecov bot commented Jan 4, 2024

Codecov Report

Merging #7662 (691b91c) into master (754095a) will decrease coverage by 0.11%.
Report is 1 commits behind head on master.
The diff coverage is 55.55%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7662      +/-   ##
==========================================
- Coverage   73.87%   73.76%   -0.11%     
==========================================
  Files         429      429              
  Lines       47376    47379       +3     
==========================================
- Hits        35000    34951      -49     
- Misses       9392     9428      +36     
- Partials     2984     3000      +16     
Flag Coverage Δ
unittests 73.76% <55.55%> (-0.11%) ⬇️

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

@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 5, 2024
@JmPotato
Copy link
Member

JmPotato commented Jan 5, 2024

/merge

Copy link
Contributor

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

Copy link
Contributor

ti-chi-bot bot commented Jan 5, 2024

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

Commit hash: 120728c

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 5, 2024
@ti-chi-bot ti-chi-bot bot merged commit c3ad361 into tikv:master Jan 5, 2024
22 checks passed
pingandb pushed a commit to pingandb/pd that referenced this pull request Jan 18, 2024
ref tikv#7576

Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
Signed-off-by: pingandb <songge102@pingan.com.cn>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

3 participants