client: fix scheme when tls config not match #7901
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -46,8 +46,8 @@ const ( | |||||
| updateMemberTimeout = time.Second // Use a shorter timeout to recover faster from network isolation. | ||||||
| updateMemberBackOffBaseTime = 100 * time.Millisecond | ||||||
|
|
||||||
| httpScheme = "http://" | ||||||
| httpsScheme = "https://" | ||||||
| ) | ||||||
|
|
||||||
| // MemberHealthCheckInterval might be changed in the unit to shorten the testing time. | ||||||
|
|
@@ -124,10 +124,8 @@ type ServiceDiscovery interface { | |||||
|
|
||||||
| // ServiceClient is an interface that defines a set of operations for a raw PD gRPC client to specific PD server. | ||||||
| type ServiceClient interface { | ||||||
| // GetAddress returns the address with HTTP scheme of the PD server. | ||||||
| GetAddress() string | ||||||
| // GetClientConn returns the gRPC connection of the service client | ||||||
| GetClientConn() *grpc.ClientConn | ||||||
| // BuildGRPCTargetContext builds a context object with a gRPC context. | ||||||
|
|
@@ -158,34 +156,15 @@ type pdServiceClient struct { | |||||
| networkFailure atomic.Bool | ||||||
| } | ||||||
|
|
||||||
| // NOTE: In the current implementation, the address passed in is bound to have an http scheme, | ||||||
| // because it is processed in `newPDServiceDiscovery`, and the url returned by etcd member is its own. | ||||||
| // When testing, the address is also bound to have an http scheme. | ||||||
HuSharp marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| func newPDServiceClient(addr, leaderAddr string, conn *grpc.ClientConn, isLeader bool) ServiceClient { | ||||||
| cli := &pdServiceClient{ | ||||||
HuSharp marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| addr: addr, | ||||||
| conn: conn, | ||||||
| isLeader: isLeader, | ||||||
| leaderAddr: leaderAddr, | ||||||
| } | ||||||
| if conn == nil { | ||||||
| cli.networkFailure.Store(true) | ||||||
|
|
@@ -201,14 +180,6 @@ func (c *pdServiceClient) GetAddress() string { | |||||
| return c.addr | ||||||
| } | ||||||
|
|
||||||
| // BuildGRPCTargetContext implements ServiceClient. | ||||||
| func (c *pdServiceClient) BuildGRPCTargetContext(ctx context.Context, toLeader bool) context.Context { | ||||||
| if c == nil || c.isLeader { | ||||||
|
|
@@ -506,7 +477,7 @@ func newPDServiceDiscovery( | |||||
| tlsCfg: tlsCfg, | ||||||
| option: option, | ||||||
| } | ||||||
| urls = addrsToUrls(urls, tlsCfg) | ||||||
| pdsd.urls.Store(urls) | ||||||
| return pdsd | ||||||
| } | ||||||
|
|
@@ -1032,7 +1003,7 @@ func (c *pdServiceDiscovery) switchLeader(addrs []string) (bool, error) { | |||||
| // If gRPC connect is created successfully or leader is new, still saves. | ||||||
| if addr != oldLeader.GetAddress() || newConn != nil { | ||||||
| // Set PD leader and Global TSO Allocator (which is also the PD leader) | ||||||
| leaderClient := newPDServiceClient(addr, addr, newConn, true) | ||||||
| c.leader.Store(leaderClient) | ||||||
| } | ||||||
| // Run callbacks | ||||||
|
|
@@ -1069,15 +1040,15 @@ func (c *pdServiceDiscovery) updateFollowers(members []*pdpb.Member, leader *pdp | |||||
| log.Warn("[pd] failed to connect follower", zap.String("follower", addr), errs.ZapError(err)) | ||||||
| continue | ||||||
| } | ||||||
| follower := newPDServiceClient(addr, leader.GetClientUrls()[0], conn, false) | ||||||
| c.followers.Store(addr, follower) | ||||||
| changed = true | ||||||
| } | ||||||
| delete(followers, addr) | ||||||
| } else { | ||||||
| changed = true | ||||||
| conn, err := c.GetOrCreateGRPCConn(addr) | ||||||
| follower := newPDServiceClient(addr, leader.GetClientUrls()[0], conn, false) | ||||||
| if err != nil || conn == nil { | ||||||
| log.Warn("[pd] failed to connect follower", zap.String("follower", addr), errs.ZapError(err)) | ||||||
| } | ||||||
|
|
@@ -1150,15 +1121,28 @@ func (c *pdServiceDiscovery) GetOrCreateGRPCConn(addr string) (*grpc.ClientConn, | |||||
| return grpcutil.GetOrCreateGRPCConn(c.ctx, &c.clientConns, addr, c.tlsCfg, c.option.gRPCDialOptions...) | ||||||
| } | ||||||
|
|
||||||
| func addrsToUrls(addrs []string, tlsCfg *tls.Config) []string { | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| // Add default schema "http://" to addrs. | ||||||
| urls := make([]string, 0, len(addrs)) | ||||||
| for _, addr := range addrs { | ||||||
| urls = append(urls, addrToUrl(addr, tlsCfg)) | ||||||
| } | ||||||
| return urls | ||||||
| } | ||||||
|
|
||||||
| func addrToUrl(addr string, tlsCfg *tls.Config) string { | ||||||
| if tlsCfg == nil { | ||||||
| if strings.HasPrefix(addr, httpsScheme) { | ||||||
| addr = fmt.Sprintf("%s%s", httpScheme, strings.TrimPrefix(addr, httpsScheme)) | ||||||
| } else if !strings.HasPrefix(addr, httpScheme) { | ||||||
| addr = fmt.Sprintf("%s%s", httpScheme, addr) | ||||||
| } | ||||||
| } else { | ||||||
| if strings.HasPrefix(addr, httpScheme) { | ||||||
|
There was a problem hiding this comment. This is only used for |
||||||
| addr = fmt.Sprintf("%s%s", httpsScheme, strings.TrimPrefix(addr, httpScheme)) | ||||||
| } else if !strings.HasPrefix(addr, httpsScheme) { | ||||||
| addr = fmt.Sprintf("%s%s", httpsScheme, addr) | ||||||
| } | ||||||
| } | ||||||
| return addr | ||||||
| } | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
tests seems like will return https scheme?