Skip to content

Commit

Permalink
feat: include the stream we failed to create in the stream limit erro…
Browse files Browse the repository at this point in the history
…r message (#12437)

Signed-off-by: Callum Styan <callumstyan@gmail.com>
  • Loading branch information
cstyan committed Apr 8, 2024
1 parent 23b2e1d commit ec81991
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions pkg/ingester/ingester_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -405,11 +405,14 @@ func TestIngesterStreamLimitExceeded(t *testing.T) {
require.NoError(t, err)

req.Streams[0].Labels = `{foo="bar",bar="baz2"}`
// The labels in error messages are sorted lexicographically and cleaned up via Push -> ParseLabels.
expectedLabels, _ := syntax.ParseLabels(req.Streams[0].Labels)

_, err = i.Push(ctx, &req)
if resp, ok := httpgrpc.HTTPResponseFromError(err); !ok || resp.Code != http.StatusTooManyRequests {
t.Fatalf("expected error about exceeding metrics per user, got %v", err)
}
require.Contains(t, err.Error(), expectedLabels.String())
}

type mockStore struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/ingester/instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ func (i *instance) createStream(ctx context.Context, pushReqStream logproto.Stre
if i.customStreamsTracker != nil {
i.customStreamsTracker.DiscardedBytesAdd(ctx, i.instanceID, validation.StreamLimit, labels, float64(bytes))
}
return nil, httpgrpc.Errorf(http.StatusTooManyRequests, validation.StreamLimitErrorMsg, i.instanceID)
return nil, httpgrpc.Errorf(http.StatusTooManyRequests, validation.StreamLimitErrorMsg, labels, i.instanceID)
}

fp := i.getHashForLabels(labels)
Expand Down
2 changes: 1 addition & 1 deletion pkg/validation/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const (
// StreamLimit is a reason for discarding lines when we can't create a new stream
// because the limit of active streams has been reached.
StreamLimit = "stream_limit"
StreamLimitErrorMsg = "Maximum active stream limit exceeded, reduce the number of active streams (reduce labels or reduce label values), or contact your Loki administrator to see if the limit can be increased, user: '%s'"
StreamLimitErrorMsg = "Maximum active stream limit exceeded when trying to create stream %s, reduce the number of active streams (reduce labels or reduce label values), or contact your Loki administrator to see if the limit can be increased, user: '%s'"
// StreamRateLimit is a reason for discarding lines when the streams own rate limit is hit
// rather than the overall ingestion rate limit.
StreamRateLimit = "per_stream_rate_limit"
Expand Down

0 comments on commit ec81991

Please sign in to comment.