Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handling of expected error codes coming from grpc storage plugins #1741 #1814

Merged
merged 6 commits into from
Oct 9, 2019
Merged

Handling of expected error codes coming from grpc storage plugins #1741 #1814

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
932f718
Handling of expected error codes coming from grpc storage plugins #1741
chandresh-pancholi Sep 24, 2019
0076fc7
Merge branch 'master' into jaeger-1741
chandresh-pancholi Sep 25, 2019
62b8d38
Merge remote-tracking branch 'upstream/master' into jaeger-1741
chandresh-pancholi Oct 9, 2019
1e160a3
Merge branch 'jaeger-1741' of https://github.com/chandresh-pancholi/j…
chandresh-pancholi Oct 9, 2019
d3ad99c
Handling of expected error codes coming from grpc storage plugins #1741
chandresh-pancholi Oct 9, 2019
4c98e21
Handling of expected error codes coming from grpc storage plugins #1741
chandresh-pancholi Oct 9, 2019
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
2 changes: 1 addition & 1 deletion plugin/storage/grpc/shared/grpc_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func (c *grpcClient) GetTrace(ctx context.Context, traceID model.TraceID) (*mode
trace := model.Trace{}
for received, err := stream.Recv(); err != io.EOF; received, err = stream.Recv() {
if err != nil {
return nil, errors.Wrap(err, "grpc stream error")
return nil, spanstore.ErrTraceNotFound
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't look right, why are you assuming that EVERY error from gRPC is "trace not found"?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed.

}

for i := range received.Spans {
Expand Down