WIP: Blocks partial results #988
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -5,12 +5,15 @@ import ( | |||||
| "context" | ||||||
| "encoding/binary" | ||||||
| "encoding/hex" | ||||||
| "fmt" | ||||||
| "io" | ||||||
| "io/ioutil" | ||||||
| "net/http" | ||||||
| "strings" | ||||||
|
|
||||||
| "github.com/go-kit/kit/log" | ||||||
| "github.com/golang/protobuf/proto" | ||||||
| "github.com/grafana/tempo/pkg/tempopb" | ||||||
| "github.com/opentracing/opentracing-go" | ||||||
| "github.com/pkg/errors" | ||||||
| "github.com/weaveworks/common/user" | ||||||
|
|
@@ -25,6 +28,9 @@ const ( | |||||
|
|
||||||
| querierPrefix = "/querier" | ||||||
| queryDelimiter = "?" | ||||||
|
|
||||||
| // todo: make configurable | ||||||
| maxBlockErrCount = 5 | ||||||
| ) | ||||||
|
|
||||||
| func ShardingWare(queryShards int, logger log.Logger) Middleware { | ||||||
|
|
@@ -154,25 +160,36 @@ func mergeResponses(ctx context.Context, rrs []RequestResponse) (*http.Response, | |||||
|
|
||||||
| var errCode = http.StatusOK | ||||||
| var errBody io.ReadCloser | ||||||
| var combinedTrace *tempopb.Trace | ||||||
| var combinedTraceBytes []byte | ||||||
| var shardMissCount, totalBlockErrCount int | ||||||
| for _, rr := range rrs { | ||||||
| partialContent := rr.Response.StatusCode == http.StatusPartialContent | ||||||
|
Contributor
There was a problem hiding this comment. Nit: renaming this to |
||||||
| if rr.Response.StatusCode == http.StatusOK || partialContent { | ||||||
| body, err := io.ReadAll(rr.Response.Body) | ||||||
| rr.Response.Body.Close() | ||||||
| if err != nil { | ||||||
| return nil, errors.Wrap(err, "error reading response body at query frontend") | ||||||
| } | ||||||
|
Comment on lines
169
to
173
Contributor
There was a problem hiding this comment. I'm wondering if we should fail the entire request here. If we can't read the body from one of the requests, isn't this also a partial result? |
||||||
|
|
||||||
| var resp tempopb.TraceByIDResponse | ||||||
| err = proto.Unmarshal(body, &resp) | ||||||
|
Comment on lines
+175
to
+176
Contributor
There was a problem hiding this comment. The querier only seems to marshal the trace part of How can we unmarshal a full |
||||||
| if err != nil { | ||||||
| return nil, errors.Wrap(err, "error reading response body at query frontend") | ||||||
| } | ||||||
|
|
||||||
| if partialContent { | ||||||
| totalBlockErrCount += int(resp.BlockErrCount) | ||||||
| if totalBlockErrCount > maxBlockErrCount { | ||||||
| return nil, fmt.Errorf("too many block queries failed (max %d)", maxBlockErrCount) | ||||||
| } | ||||||
|
Comment on lines
+183
to
185
Contributor
There was a problem hiding this comment. I'm wondering if it's useful to fail on |
||||||
| } | ||||||
|
|
||||||
| if combinedTrace == nil { | ||||||
| combinedTrace = resp.Trace | ||||||
| } else { | ||||||
| combinedTrace, _, _, _ = model.CombineTraceProtos(combinedTrace, resp.Trace) | ||||||
| } | ||||||
| } else if rr.Response.StatusCode != http.StatusNotFound { | ||||||
| errCode = rr.Response.StatusCode | ||||||
| errBody = rr.Response.Body | ||||||
|
|
@@ -181,6 +198,14 @@ func mergeResponses(ctx context.Context, rrs []RequestResponse) (*http.Response, | |||||
| } | ||||||
| } | ||||||
|
|
||||||
| if combinedTrace != nil { | ||||||
| var err error | ||||||
| combinedTraceBytes, err = combinedTrace.Marshal() | ||||||
| if err != nil { | ||||||
| return nil, errors.Wrap(err, "error marshaling combined trace at query frontend") | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| if shardMissCount == len(rrs) { | ||||||
|
Contributor
There was a problem hiding this comment. We can move this block above |
||||||
| return &http.Response{ | ||||||
| StatusCode: http.StatusNotFound, | ||||||
|
|
@@ -190,12 +215,18 @@ func mergeResponses(ctx context.Context, rrs []RequestResponse) (*http.Response, | |||||
| } | ||||||
|
|
||||||
| if errCode == http.StatusOK { | ||||||
| statusCode := http.StatusOK | ||||||
| if totalBlockErrCount > 0 { | ||||||
| // If there are failed blocks, and we haven't returned with an error, | ||||||
| // signal the upstream that the result contains partial results. | ||||||
| statusCode = http.StatusPartialContent | ||||||
| } | ||||||
| return &http.Response{ | ||||||
| StatusCode: statusCode, | ||||||
| Body: ioutil.NopCloser(bytes.NewReader(combinedTraceBytes)), | ||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
|
||||||
| // ContentLength header is added to log the size of response in the Tripperware in frontend.go | ||||||
| // This could be overwritten if the query client and Tempo negotiate compression | ||||||
| ContentLength: int64(len(combinedTraceBytes)), | ||||||
| Header: http.Header{}, | ||||||
| }, nil | ||||||
| } | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: we don't use
combinedTraceBytesin this for-loop yet, so we can move the declaration a bit more down in this function. This makes the code a bit easier to read as we don't have to worry about this variable yet.