Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
  • Loading branch information
pracucci authored Oct 29, 2023
1 parent 91fd892 commit d676d1e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/ingester/client/streaming.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func (s *SeriesChunksStreamReader) readStream(log *spanlogger.SpanLogger) error
return fmt.Errorf("expected to receive %v series, but got EOF after receiving %v series", s.expectedSeriesCount, totalSeries)
}

level.Debug(log).Log("msg", "finished streaming", "series", totalSeries, "chunks", totalChunks)
log.DebugLog("msg", "finished streaming", "series", totalSeries, "chunks", totalChunks)
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/querier/block_streaming.go
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ func (s *storeGatewayStreamReader) GetChunks(seriesIndex uint64) (_ []storepb.Ag
// 1. If we receive more series than expected (likely due to a bug), or something else goes wrong after receiving the last series,
// StartBuffering() will return an error. This method will then return it, which will bubble up to the PromQL engine and report
// it, rather than it potentially being logged and missed.
// 2. It ensures the gPRC stream is cleaned up before the PromQL engine cancels the context used for the query. If the context
// 2. It ensures the gRPC stream is cleaned up before the PromQL engine cancels the context used for the query. If the context
// is cancelled before the gRPC stream's Recv() returns EOF, this can result in misleading context cancellation errors being
// logged and included in metrics and traces, when in fact the call succeeded.
if err := <-s.errorChan; err != nil {
Expand Down

0 comments on commit d676d1e

Please sign in to comment.