From bcf53623164dd72bf654d56cd67224f5e24dcb68 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 30 May 2023 20:18:09 +0800 Subject: [PATCH 1/5] grpc --- pkg/discoveryregistry/zookeeper/discover.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/discoveryregistry/zookeeper/discover.go b/pkg/discoveryregistry/zookeeper/discover.go index aa0f74266..b0f6068fa 100644 --- a/pkg/discoveryregistry/zookeeper/discover.go +++ b/pkg/discoveryregistry/zookeeper/discover.go @@ -94,8 +94,9 @@ func (s *ZkClient) GetConns(ctx context.Context, serviceName string, opts ...grp } func (s *ZkClient) GetConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) { - newOpts := append(s.options, grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, s.balancerName))) - return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), append(newOpts, opts...)...) + // newOpts := append(s.options, grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, s.balancerName))) + // return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), append(newOpts, opts...)...) + return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), opts) } func (s *ZkClient) GetFirstConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) { From 01ab3d28ccd5277f1cb3297a5f376d5f7594cb84 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 30 May 2023 20:19:26 +0800 Subject: [PATCH 2/5] grpc --- pkg/discoveryregistry/zookeeper/discover.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/discoveryregistry/zookeeper/discover.go b/pkg/discoveryregistry/zookeeper/discover.go index b0f6068fa..bcde0884b 100644 --- a/pkg/discoveryregistry/zookeeper/discover.go +++ b/pkg/discoveryregistry/zookeeper/discover.go @@ -96,7 +96,7 @@ func (s *ZkClient) GetConns(ctx context.Context, serviceName string, opts ...grp func (s *ZkClient) GetConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) { // newOpts := append(s.options, grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, s.balancerName))) // return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), append(newOpts, opts...)...) - return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), opts) + return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), opts...) } func (s *ZkClient) GetFirstConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) { From 72244b82f5cbb68554e987659b576acde3c2de6c Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 30 May 2023 20:21:20 +0800 Subject: [PATCH 3/5] opts --- pkg/discoveryregistry/zookeeper/discover.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/discoveryregistry/zookeeper/discover.go b/pkg/discoveryregistry/zookeeper/discover.go index bcde0884b..dda0163eb 100644 --- a/pkg/discoveryregistry/zookeeper/discover.go +++ b/pkg/discoveryregistry/zookeeper/discover.go @@ -96,7 +96,7 @@ func (s *ZkClient) GetConns(ctx context.Context, serviceName string, opts ...grp func (s *ZkClient) GetConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) { // newOpts := append(s.options, grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, s.balancerName))) // return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), append(newOpts, opts...)...) - return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), opts...) + return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), append(s.options, opts)) } func (s *ZkClient) GetFirstConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) { From 96bcc1bd4c341d4f0adb1d8f062ff33de6aa12c3 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 30 May 2023 20:21:41 +0800 Subject: [PATCH 4/5] grpc --- pkg/discoveryregistry/zookeeper/discover.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/discoveryregistry/zookeeper/discover.go b/pkg/discoveryregistry/zookeeper/discover.go index dda0163eb..a80820c9b 100644 --- a/pkg/discoveryregistry/zookeeper/discover.go +++ b/pkg/discoveryregistry/zookeeper/discover.go @@ -96,7 +96,7 @@ func (s *ZkClient) GetConns(ctx context.Context, serviceName string, opts ...grp func (s *ZkClient) GetConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) { // newOpts := append(s.options, grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, s.balancerName))) // return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), append(newOpts, opts...)...) - return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), append(s.options, opts)) + return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), append(s.options, opts)...) } func (s *ZkClient) GetFirstConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) { From 3b7705943c8a1a1cc9c65a178c8f79791eb47afb Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 30 May 2023 20:22:32 +0800 Subject: [PATCH 5/5] grpc --- pkg/discoveryregistry/zookeeper/discover.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/discoveryregistry/zookeeper/discover.go b/pkg/discoveryregistry/zookeeper/discover.go index a80820c9b..413b15e9f 100644 --- a/pkg/discoveryregistry/zookeeper/discover.go +++ b/pkg/discoveryregistry/zookeeper/discover.go @@ -96,7 +96,7 @@ func (s *ZkClient) GetConns(ctx context.Context, serviceName string, opts ...grp func (s *ZkClient) GetConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) { // newOpts := append(s.options, grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, s.balancerName))) // return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), append(newOpts, opts...)...) - return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), append(s.options, opts)...) + return grpc.DialContext(ctx, fmt.Sprintf("%s:///%s", s.scheme, serviceName), append(s.options, opts...)...) } func (s *ZkClient) GetFirstConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) {