From 04bc6ae4936a0773860a7587ee7b97d85a5c7ccc Mon Sep 17 00:00:00 2001 From: Gaius Date: Thu, 27 Oct 2022 16:12:15 +0800 Subject: [PATCH] feat: grpc scheduler client dial options (#1792) Signed-off-by: Gaius --- pkg/rpc/scheduler/client/client.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/rpc/scheduler/client/client.go b/pkg/rpc/scheduler/client/client.go index 0af4832a1..f0548ce9f 100644 --- a/pkg/rpc/scheduler/client/client.go +++ b/pkg/rpc/scheduler/client/client.go @@ -51,7 +51,6 @@ const ( backoffWaitBetween = 500 * time.Millisecond ) -// GetClient get scheduler clients using resolver and balancer, func GetClient(ctx context.Context, dynconfig config.Dynconfig, opts ...grpc.DialOption) (Client, error) { // Register resolver and balancer. resolver.RegisterScheduler(dynconfig) @@ -90,6 +89,7 @@ func GetClient(ctx context.Context, dynconfig config.Dynconfig, opts ...grpc.Dia SchedulerClient: schedulerv1.NewSchedulerClient(conn), ClientConn: conn, Dynconfig: dynconfig, + dialOptions: opts, }, nil } @@ -125,6 +125,7 @@ type client struct { schedulerv1.SchedulerClient *grpc.ClientConn config.Dynconfig + dialOptions []grpc.DialOption } // RegisterPeerTask registers a peer into task. @@ -208,7 +209,7 @@ func (c *client) leaveHost(ctx context.Context, addr string, req *schedulerv1.Le conn, err := grpc.DialContext( ctx, addr, - []grpc.DialOption{ + append([]grpc.DialOption{ grpc.WithUnaryInterceptor(grpc_middleware.ChainUnaryClient( rpc.ConvertErrorUnaryClientInterceptor, otelgrpc.UnaryClientInterceptor(), @@ -219,7 +220,7 @@ func (c *client) leaveHost(ctx context.Context, addr string, req *schedulerv1.Le grpc_retry.WithBackoff(grpc_retry.BackoffLinear(backoffWaitBetween)), ), )), - }..., + }, c.dialOptions...)..., ) if err != nil { return err