From f6f2f47947e80d5c2df78910205096da1b2267e3 Mon Sep 17 00:00:00 2001 From: Nate Broyles Date: Sat, 9 Jan 2021 20:47:07 -0500 Subject: [PATCH 1/2] [dbnode] Remove per-series traces on read queries --- .../server/tchannelthrift/node/service.go | 36 +++---------------- src/dbnode/storage/database.go | 11 ------ 2 files changed, 4 insertions(+), 43 deletions(-) diff --git a/src/dbnode/network/server/tchannelthrift/node/service.go b/src/dbnode/network/server/tchannelthrift/node/service.go index 2250b1ba5a..61ac91688f 100644 --- a/src/dbnode/network/server/tchannelthrift/node/service.go +++ b/src/dbnode/network/server/tchannelthrift/node/service.go @@ -844,7 +844,7 @@ func (s *service) fetchReadResults( defer sp.Finish() for idx := range response.Elements { - segments, rpcErr := s.readEncodedResult(ctx, nsID, encodedDataResults[idx]) + segments, rpcErr := s.readEncodedResult(ctx, encodedDataResults[idx]) if rpcErr != nil { return rpcErr } @@ -1024,7 +1024,7 @@ func (s *service) FetchBatchRaw(tctx thrift.Context, req *rpc.FetchBatchRawReque continue } - segments, rpcErr := s.readEncodedResult(ctx, nsID, encodedResults[i].result) + segments, rpcErr := s.readEncodedResult(ctx, encodedResults[i].result) if rpcErr != nil { rawResult.Err = rpcErr if tterrors.IsBadRequestError(rawResult.Err) { @@ -1101,7 +1101,7 @@ func (s *service) FetchBatchRawV2(tctx thrift.Context, req *rpc.FetchBatchRawV2R continue } - segments, rpcErr := s.readEncodedResult(ctx, nsIdx, encodedResult) + segments, rpcErr := s.readEncodedResult(ctx, encodedResult) if rpcErr != nil { rawResult.Err = rpcErr if tterrors.IsBadRequestError(rawResult.Err) { @@ -2308,18 +2308,8 @@ func (s *service) newPooledID( func (s *service) readEncodedResult( ctx context.Context, - nsID ident.ID, encoded [][]xio.BlockReader, ) ([]*rpc.Segments, *rpc.Error) { - ctx, sp, sampled := ctx.StartSampledTraceSpan(tracepoint.FetchReadSingleResult) - if sampled { - sp.LogFields( - opentracinglog.String("id", nsID.String()), - opentracinglog.Int("segmentCount", len(encoded)), - ) - } - defer sp.Finish() - segments := s.pools.segmentsArray.Get() segments = segmentsArr(segments).grow(len(encoded)) segments = segments[:0] @@ -2328,7 +2318,7 @@ func (s *service) readEncodedResult( })) for _, readers := range encoded { - segment, err := s.readEncodedResultSegment(ctx, nsID, readers) + segment, err := s.readEncodedResultSegment(readers) if err != nil { return nil, err } @@ -2342,12 +2332,8 @@ func (s *service) readEncodedResult( } func (s *service) readEncodedResultSegment( - ctx context.Context, - nsID ident.ID, readers []xio.BlockReader, ) (*rpc.Segments, *rpc.Error) { - ctx, sp, sampled := ctx.StartSampledTraceSpan(tracepoint.FetchReadSegment) - defer sp.Finish() converted, err := convert.ToSegments(readers) if err != nil { return nil, convert.ToRPCError(err) @@ -2356,20 +2342,6 @@ func (s *service) readEncodedResultSegment( return nil, nil } - if sampled { - sp.LogFields( - opentracinglog.String("id", nsID.String()), - opentracinglog.Int("blockCount", len(readers)), - opentracinglog.Int("unmergedCount", len(converted.Segments.Unmerged)), - ) - - if converted.Segments.Merged != nil { - sp.LogFields( - opentracinglog.Int64("mergedBlockSize", converted.Segments.Merged.GetBlockSize()), - opentracinglog.Int64("mergedStartTime", converted.Segments.Merged.GetStartTime()), - ) - } - } return converted.Segments, nil } diff --git a/src/dbnode/storage/database.go b/src/dbnode/storage/database.go index f74bf6ba90..b6356d4cdb 100644 --- a/src/dbnode/storage/database.go +++ b/src/dbnode/storage/database.go @@ -927,17 +927,6 @@ func (d *db) ReadEncoded( return nil, err } - ctx, sp, sampled := ctx.StartSampledTraceSpan(tracepoint.DBReadEncoded) - if sampled { - sp.LogFields( - opentracinglog.String("namespace", namespace.String()), - opentracinglog.String("id", id.String()), - xopentracing.Time("start", start), - xopentracing.Time("end", end), - ) - } - - defer sp.Finish() return n.ReadEncoded(ctx, id, start, end) } From 4d7d88e546a4765f71ed46ad79947b499bf5a082 Mon Sep 17 00:00:00 2001 From: Rob Skillington Date: Sat, 9 Jan 2021 22:05:45 -0500 Subject: [PATCH 2/2] Fix unit tests --- .../server/tchannelthrift/node/service_test.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/dbnode/network/server/tchannelthrift/node/service_test.go b/src/dbnode/network/server/tchannelthrift/node/service_test.go index 2b8faf0219..637a19612c 100644 --- a/src/dbnode/network/server/tchannelthrift/node/service_test.go +++ b/src/dbnode/network/server/tchannelthrift/node/service_test.go @@ -1651,15 +1651,12 @@ func TestServiceFetchTagged(t *testing.T) { sp.Finish() spans := mtr.FinishedSpans() - require.Len(t, spans, 8) + + require.Len(t, spans, 4) assert.Equal(t, tracepoint.FetchReadEncoded, spans[0].OperationName) - assert.Equal(t, tracepoint.FetchReadSegment, spans[1].OperationName) - assert.Equal(t, tracepoint.FetchReadSingleResult, spans[2].OperationName) - assert.Equal(t, tracepoint.FetchReadSegment, spans[3].OperationName) - assert.Equal(t, tracepoint.FetchReadSingleResult, spans[4].OperationName) - assert.Equal(t, tracepoint.FetchReadResults, spans[5].OperationName) - assert.Equal(t, tracepoint.FetchTagged, spans[6].OperationName) - assert.Equal(t, "root", spans[7].OperationName) + assert.Equal(t, tracepoint.FetchReadResults, spans[1].OperationName) + assert.Equal(t, tracepoint.FetchTagged, spans[2].OperationName) + assert.Equal(t, "root", spans[3].OperationName) } func TestServiceFetchTaggedIsOverloaded(t *testing.T) {