Skip to content

fix(v2): ignore client timeouts in write-path circuit breaker #3858

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

Merged
merged 1 commit into from
Jan 21, 2025
Merged

fix(v2): ignore client timeouts in write-path circuit breaker #3858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions pkg/experiment/ingester/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,12 @@ func isClientError(err error) bool {
switch status.Code(err) {
case codes.InvalidArgument,
codes.Canceled,
codes.DeadlineExceeded,
codes.PermissionDenied,
codes.Unauthenticated:
return true
default:
return errors.Is(err, context.Canceled)
return errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded)
}
}

Expand Down Expand Up @@ -119,9 +120,7 @@ func shouldBeHandledByCaller(err error) bool {
if errors.Is(err, os.ErrDeadlineExceeded) {
return false
}
switch status.Code(err) {
case codes.Unavailable,
codes.DeadlineExceeded:
if status.Code(err) == codes.Unavailable {
return false
}
// The error handling is returned back the caller: the circuit
Expand Down Expand Up @@ -207,7 +206,7 @@ func (c *Client) Push(
k := distributor.NewTenantServiceDatasetKey(req.TenantId, req.Labels...)
p, dErr := c.distributor.Distribute(k)
if dErr != nil {
_ = level.Error(c.logger).Log(
level.Error(c.logger).Log(
"msg", "unable to distribute request",
"tenant", req.TenantId,
"err", dErr,
Expand All @@ -228,7 +227,7 @@ func (c *Client) Push(
"instance_id", instance.Id,
"attempts_left", attempts,
)
_ = level.Debug(logger).Log("msg", "sending request")
level.Debug(logger).Log("msg", "sending request")
resp, err = c.pushToInstance(ctx, req, instance.Addr)
if err == nil {
return resp, nil
Expand All @@ -237,16 +236,16 @@ func (c *Client) Push(
return nil, err
}
if !isRetryable(err) {
_ = level.Error(logger).Log("msg", "failed to push data to segment writer", "err", err)
level.Error(logger).Log("msg", "failed to push data to segment writer", "err", err)
return nil, status.Error(codes.Unavailable, errServiceUnavailableMsg)
}
_ = level.Warn(logger).Log("msg", "failed attempt to push data to segment writer", "err", err)
level.Warn(logger).Log("msg", "failed attempt to push data to segment writer", "err", err)
if err = ctx.Err(); err != nil {
return nil, err
}
}

_ = level.Error(c.logger).Log(
level.Error(c.logger).Log(
"msg", "no segment writer instances available for the request",
"tenant", req.TenantId,
"shard", req.Shard,
Expand Down
9 changes: 9 additions & 0 deletions pkg/experiment/ingester/client/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,15 @@ func (s *segwriterClientSuite) Test_Push_ClientError_Cancellation() {
s.Assert().Equal(codes.Canceled.String(), status.Code(err).String())
}

func (s *segwriterClientSuite) Test_Push_ClientError_Deadline() {
s.service.On("Push", mock.Anything, mock.Anything).
Return(new(segmentwriterv1.PushResponse), context.DeadlineExceeded).
Once()

_, err := s.client.Push(context.Background(), &segmentwriterv1.PushRequest{})
s.Assert().Equal(codes.DeadlineExceeded.String(), status.Code(err).String())
}

func (s *segwriterClientSuite) Test_Push_ClientError_InvalidArgument() {
s.service.On("Push", mock.Anything, mock.Anything).
Return(new(segmentwriterv1.PushResponse), status.Error(codes.InvalidArgument, errServiceUnavailableMsg)).
Expand Down
Loading