Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions carbonserver/render.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (

"go.uber.org/zap"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/peer"
"google.golang.org/grpc/status"

Expand Down Expand Up @@ -646,6 +647,13 @@ func (listener *CarbonserverListener) streamMetrics(stream grpcv2.CarbonV2_Rende
return
}

const gRPCRenderMetricsCountHeaderKey = "metrics-count"

func sendRenderMetadataHeader(stream grpcv2.CarbonV2_RenderServer, filesCount int) error {
header := metadata.Pairs(gRPCRenderMetricsCountHeaderKey, strconv.Itoa(filesCount))
return stream.SendHeader(header)
}

// Render implements Render rpc of CarbonV2 gRPC service
func (listener *CarbonserverListener) Render(req *protov2.MultiFetchRequest, stream grpcv2.CarbonV2_RenderServer) (rpcErr error) {
t0 := time.Now()
Expand Down Expand Up @@ -726,6 +734,10 @@ func (listener *CarbonserverListener) Render(req *protov2.MultiFetchRequest, str
metricGlobMap := getMetricGlobMapFromExpandedGlobs(expandedGlobs)
tle.MetricGlobMapLength = len(metricGlobMap)
filesCount := countFilesInExpandedGlobs(expandedGlobs)
err = sendRenderMetadataHeader(stream, filesCount)
if err != nil {
return nil, err
}
prepareChan := make(chan response, getStreamingChannelSize(filesCount))
go func() {
prepareT0 := time.Now()
Expand Down Expand Up @@ -768,6 +780,7 @@ func (listener *CarbonserverListener) Render(req *protov2.MultiFetchRequest, str
case res != nil:
atomic.AddUint64(&listener.metrics.QueryCacheHit, 1)
cachedResponses := res.([]response)
err = sendRenderMetadataHeader(stream, len(cachedResponses))
responseChanToStream = make(chan response, getStreamingChannelSize(len(cachedResponses)))
go func() {
for _, r := range cachedResponses {
Expand Down