From e2331372d89e5d741e8e5d70d0baef513fe49edc Mon Sep 17 00:00:00 2001 From: Cody Soyland Date: Mon, 1 Feb 2021 09:23:30 -0600 Subject: [PATCH] Handle errors --- server/grpc.go | 20 ++++++++++++++++---- server/grpc_test.go | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/server/grpc.go b/server/grpc.go index 8ffc49ad3..f50c9ac80 100644 --- a/server/grpc.go +++ b/server/grpc.go @@ -148,9 +148,12 @@ func (h *GRPCHandler) QuerySQL(req *pb.QuerySQLRequest, stream pb.Pilosa_QuerySQ return err } - stream.SendHeader(metadata.New(map[string]string{ + err = stream.SendHeader(metadata.New(map[string]string{ "duration": strconv.Itoa(int(duration)), })) + if err != nil { + return errors.Wrap(err, "sending header") + } err = newDurationRowser(results, duration).ToRows(stream.Send) if err != nil { @@ -191,9 +194,12 @@ func (h *GRPCHandler) QuerySQLUnary(ctx context.Context, req *pb.QuerySQLRequest } duration := time.Since(start) table.Duration = int64(duration) - grpc.SendHeader(ctx, metadata.New(map[string]string{ + err = grpc.SendHeader(ctx, metadata.New(map[string]string{ "duration": strconv.Itoa(int(duration)), })) + if err != nil { + return nil, errors.Wrap(err, "sending header") + } return table, nil } @@ -209,9 +215,12 @@ func (h *GRPCHandler) QueryPQL(req *pb.QueryPQLRequest, stream pb.Pilosa_QueryPQ resp, err := h.api.Query(stream.Context(), &query) durQuery := time.Since(t) - stream.SendHeader(metadata.New(map[string]string{ + err = stream.SendHeader(metadata.New(map[string]string{ "duration": strconv.Itoa(int(durQuery)), })) + if err != nil { + return errors.Wrap(err, "sending header") + } // TODO: what about resp.CollumnAttrSets? if err != nil { @@ -280,9 +289,12 @@ func (h *GRPCHandler) QueryPQLUnary(ctx context.Context, req *pb.QueryPQLRequest duration := durQuery + durFormat table.Duration = int64(duration) - grpc.SendHeader(ctx, metadata.New(map[string]string{ + err = grpc.SendHeader(ctx, metadata.New(map[string]string{ "duration": strconv.Itoa(int(duration)), })) + if err != nil { + return nil, errors.Wrap(err, "sending header") + } h.stats.Timing(pilosa.MetricGRPCUnaryQueryDurationSeconds, durQuery, 0.1) h.stats.Timing(pilosa.MetricGRPCUnaryFormatDurationSeconds, durFormat, 0.1) diff --git a/server/grpc_test.go b/server/grpc_test.go index 89ae9451f..843fe2fe1 100644 --- a/server/grpc_test.go +++ b/server/grpc_test.go @@ -1462,7 +1462,7 @@ func (m *mockPilosa_QuerySQLServer) SetHeader(md metadata.MD) error { } func (m *mockPilosa_QuerySQLServer) SetTrailer(md metadata.MD) { - m.MockServerTransportStream.SetTrailer(md) + _ = m.MockServerTransportStream.SetTrailer(md) } func (m *mockPilosa_QuerySQLServer) Context() context.Context {