Skip to content

Removing fingerprint calculator from the lock on the GetSeries API #4765

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
Jun 29, 2022
Merged

Removing fingerprint calculator from the lock on the GetSeries API #4765

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
9942d9b
Removing fingerprint calculator from the lock on the GetSeries API
alanprot Jun 28, 2022
02afcc2
Add test to prove order does not matter on QueryLimiter,AddSeries
alanprot Jun 28, 2022
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
9 changes: 6 additions & 3 deletions pkg/distributor/distributor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,8 +1028,9 @@ func (d *Distributor) MetricsForLabelMatchers(ctx context.Context, from, through
if err := queryLimiter.AddSeries(cortexpb.FromMetricsToLabelAdapters(m)); err != nil {
return nil, err
}
fingerprint := m.Fingerprint()
mutex.Lock()
(*metrics)[m.Fingerprint()] = m
(*metrics)[fingerprint] = m
mutex.Unlock()
}

Expand Down Expand Up @@ -1060,11 +1061,13 @@ func (d *Distributor) MetricsForLabelMatchersStream(ctx context.Context, from, t
for _, metric := range resp.Metric {
m := cortexpb.FromLabelAdaptersToMetricWithCopy(metric.Labels)

if err := queryLimiter.AddSeries(cortexpb.FromMetricsToLabelAdapters(m)); err != nil {
if err := queryLimiter.AddSeries(metric.Labels); err != nil {
return nil, err
}

fingerprint := m.Fingerprint()
mutex.Lock()
(*metrics)[m.Fingerprint()] = m
(*metrics)[fingerprint] = m
mutex.Unlock()
}
}
Expand Down
32 changes: 29 additions & 3 deletions pkg/util/limiter/query_limiter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,43 @@ func TestQueryLimiter_AddSeriers_ShouldReturnErrorOnLimitExceeded(t *testing.T)
)

var (
series1 = labels.FromMap(map[string]string{
labels.MetricName: metricName + "_1",
series1 = []cortexpb.LabelAdapter{
{
Name: labels.MetricName,
Value: metricName + "_1",
},
{
Name: "series1",
Value: "1",
},
}

series1OtherOrderLabels = []cortexpb.LabelAdapter{
{
Name: "series1",
Value: "1",
},
{
Name: labels.MetricName,
Value: metricName + "_1",
},
}

series1FromMap = labels.FromMap(map[string]string{
"series1": "1",
labels.MetricName: metricName + "_1",
})
series2 = labels.FromMap(map[string]string{
labels.MetricName: metricName + "_2",
"series2": "1",
})
limiter = NewQueryLimiter(1, 0, 0)
)
err := limiter.AddSeries(cortexpb.FromLabelsToLabelAdapters(series1))
err := limiter.AddSeries(series1)
require.NoError(t, err)
err = limiter.AddSeries(cortexpb.FromLabelsToLabelAdapters(series1FromMap))
require.NoError(t, err)
err = limiter.AddSeries(series1OtherOrderLabels)
require.NoError(t, err)
err = limiter.AddSeries(cortexpb.FromLabelsToLabelAdapters(series2))
require.Error(t, err)
Expand Down