From e7f0f92fd8d9c1175d00fa8444b6ec2cae000d7a Mon Sep 17 00:00:00 2001 From: Menghan Li Date: Thu, 2 Apr 2020 16:55:06 -0700 Subject: [PATCH] xds: add temporary logging to LRS (#3490) --- xds/internal/balancer/lrs/lrs.go | 14 ++++++++------ xds/internal/client/client_loadreport.go | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/xds/internal/balancer/lrs/lrs.go b/xds/internal/balancer/lrs/lrs.go index 8aafcc435047..811cd913a2eb 100644 --- a/xds/internal/balancer/lrs/lrs.go +++ b/xds/internal/balancer/lrs/lrs.go @@ -313,9 +313,10 @@ func (ls *lrsStore) ReportTo(ctx context.Context, cc *grpc.ClientConn, clusterNa grpclog.Warningf("lrs: failed to create stream: %v", err) continue } - if err := stream.Send(&lrspb.LoadStatsRequest{ - Node: node, - }); err != nil { + grpclog.Infof("lrs: created LRS stream") + req := &lrspb.LoadStatsRequest{Node: node} + grpclog.Infof("lrs: sending init LoadStatsRequest: %v", req) + if err := stream.Send(req); err != nil { grpclog.Warningf("lrs: failed to send first request: %v", err) continue } @@ -324,6 +325,7 @@ func (ls *lrsStore) ReportTo(ctx context.Context, cc *grpc.ClientConn, clusterNa grpclog.Warningf("lrs: failed to receive first response: %v", err) continue } + grpclog.Infof("lrs: received first LoadStatsResponse: %+v", first) interval, err := ptypes.Duration(first.LoadReportingInterval) if err != nil { grpclog.Warningf("lrs: failed to convert report interval: %v", err) @@ -366,9 +368,9 @@ func (ls *lrsStore) sendLoads(ctx context.Context, stream lrsgrpc.LoadReportingS case <-ctx.Done(): return } - if err := stream.Send(&lrspb.LoadStatsRequest{ - ClusterStats: ls.buildStats(clusterName), - }); err != nil { + req := &lrspb.LoadStatsRequest{ClusterStats: ls.buildStats(clusterName)} + grpclog.Infof("lrs: sending LRS loads: %+v", req) + if err := stream.Send(req); err != nil { grpclog.Warningf("lrs: failed to send report: %v", err) return } diff --git a/xds/internal/client/client_loadreport.go b/xds/internal/client/client_loadreport.go index 36b7d5df97a5..42766f997163 100644 --- a/xds/internal/client/client_loadreport.go +++ b/xds/internal/client/client_loadreport.go @@ -44,9 +44,11 @@ func (c *Client) ReportLoad(server string, clusterName string, loadStore lrs.Sto cc *grpc.ClientConn closeCC bool ) + c.logger.Infof("Starting load report to server: %s", server) if server == "" || server == c.opts.Config.BalancerName { cc = c.cc } else { + c.logger.Infof("LRS server is different from xDS server, starting a new ClientConn") dopts := append([]grpc.DialOption{c.opts.Config.Creds}, c.opts.DialOpts...) ccNew, err := grpc.Dial(server, dopts...) if err != nil {