Skip to content

Make the per labelset series limit error message consistent with per user series error message #7015

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 2 commits into from
Sep 9, 2025
+9 −9
Merged

Make the per labelset series limit error message consistent with per user series error message #7015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
904a106
Make the per labelset series limit error message consistent with per …
alvinlin123 Sep 5, 2025
0584b26
address PR comments
alvinlin123 Sep 8, 2025
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
16 changes: 8 additions & 8 deletions pkg/ingester/limiter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ var (

type errMaxSeriesPerLabelSetLimitExceeded struct {
error
id string
localLimit int
globalLimit int
id string
actualLocalLimit int
globalLimit int
}

// RingCount is the interface exposed by a ring implementation which allows
Expand Down Expand Up @@ -130,9 +130,9 @@ func (l *Limiter) AssertMaxSeriesPerLabelSet(userID string, metric labels.Labels
return err
} else if u >= local {
return errMaxSeriesPerLabelSetLimitExceeded{
id: limit.Id,
localLimit: local,
globalLimit: limit.Limits.MaxSeries,
id: limit.Id,
actualLocalLimit: local,
globalLimit: limit.Limits.MaxSeries,
}
}
}
Expand Down Expand Up @@ -208,8 +208,8 @@ func (l *Limiter) formatMaxMetadataPerMetricError(userID string, metric string)
}

func (l *Limiter) formatMaxSeriesPerLabelSetError(err errMaxSeriesPerLabelSetLimitExceeded) error {
return fmt.Errorf("per-labelset series limit of %d exceeded (labelSet: %s, local limit: %d global limit: %d actual)",
minNonZero(err.globalLimit, err.localLimit), err.id, err.localLimit, err.globalLimit)
return fmt.Errorf("per-labelset series limit of %d exceeded (labelSet: %s, global limit: %d actual local limit: %d)",
minNonZero(err.globalLimit, err.actualLocalLimit), err.id, err.globalLimit, err.actualLocalLimit)
}

func (l *Limiter) limitsPerLabelSets(userID string, metric labels.Labels) []validation.LimitsPerLabelSet {
Expand Down
2 changes: 1 addition & 1 deletion pkg/ingester/limiter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ func TestLimiter_AssertMaxSeriesPerLabelSet(t *testing.T) {
ringIngesterCount: 10,
series: 200,
shardByAllLabels: true,
expected: errMaxSeriesPerLabelSetLimitExceeded{globalLimit: 10, localLimit: 3},
expected: errMaxSeriesPerLabelSetLimitExceeded{globalLimit: 10, actualLocalLimit: 3},
limits: validation.Limits{
LimitsPerLabelSet: []validation.LimitsPerLabelSet{
{
Expand Down
Loading