mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Report grpc canceled timeouts as cancelled status and not error (#99981)
This commit is contained in:
@@ -7,6 +7,9 @@ import (
|
||||
"net/textproto"
|
||||
"strings"
|
||||
|
||||
grpccodes "google.golang.org/grpc/codes"
|
||||
grpcstatus "google.golang.org/grpc/status"
|
||||
|
||||
"github.com/grafana/grafana-plugin-sdk-go/backend"
|
||||
|
||||
"github.com/grafana/grafana/pkg/plugins"
|
||||
@@ -61,6 +64,10 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
|
||||
return nil, plugins.ErrPluginRequestCanceledErrorBase.Errorf("client: query data request canceled: %w", err)
|
||||
}
|
||||
|
||||
if s, ok := grpcstatus.FromError(err); ok && s.Code() == grpccodes.Canceled {
|
||||
return nil, plugins.ErrPluginRequestCanceledErrorBase.Errorf("client: query data request canceled: %w", err)
|
||||
}
|
||||
|
||||
return nil, plugins.ErrPluginDownstreamErrorBase.Errorf("client: failed to query data: %w", err)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user